From 09eaad6a6a4385862845846ced393a27aa9cb006 Mon Sep 17 00:00:00 2001
From: jeff levesque <jeff1evesque@yahoo.com>
Date: Mon, 6 Mar 2017 23:22:24 -0500
Subject: [PATCH] #2932: move 'package::webcompilers' into 'webcompilers.pp'

---
 .../docker/modules/compiler/manifests/init.pp         |  1 -
 .../docker/modules/compiler/manifests/webcompilers.pp | 11 +++++++++++
 .../vagrant/modules/compiler/manifests/init.pp        |  1 -
 .../modules/compiler/manifests/webcompilers.pp        | 11 +++++++++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/puppet/environment/docker/modules/compiler/manifests/init.pp b/puppet/environment/docker/modules/compiler/manifests/init.pp
index 5e4689855..b1bf78361 100644
--- a/puppet/environment/docker/modules/compiler/manifests/init.pp
+++ b/puppet/environment/docker/modules/compiler/manifests/init.pp
@@ -5,7 +5,6 @@
 class compiler {
     ## ensure log directory, package dependencies
     require system::log_directory
-    contain package::webcompilers
 
     ## configure webcompilers
     require system::webcompiler_directory
diff --git a/puppet/environment/docker/modules/compiler/manifests/webcompilers.pp b/puppet/environment/docker/modules/compiler/manifests/webcompilers.pp
index 43c603b46..e8ba53611 100644
--- a/puppet/environment/docker/modules/compiler/manifests/webcompilers.pp
+++ b/puppet/environment/docker/modules/compiler/manifests/webcompilers.pp
@@ -2,6 +2,9 @@
 ### webcompilers.pp, create webcompiler services.
 ###
 class compiler::webcompilers {
+    include package::react_presets
+    include package::webcompilers
+
     ## variables
     $hiera_general   = lookup('general')
     $root_dir        = $hiera_general['root']
@@ -34,6 +37,10 @@
         file { "/etc/init/${compiler}.conf":
             ensure  => file,
             content => dos2unix(template($template_path)),
+            require => [
+                Class['package::webcompilers'],
+                Class['package::react_presets'],
+            ],
         }
 
         ## dos2unix upstart: convert clrf (windows to linux) in case host
@@ -42,6 +49,10 @@
             ensure  => file,
             content => dos2unix(template("${compiler_dir}/${compiler}")),
             mode    => '0755',
+            require => [
+                Class['package::webcompilers'],
+                Class['package::react_presets'],
+            ],
         }
     }
 }
\ No newline at end of file
diff --git a/puppet/environment/vagrant/modules/compiler/manifests/init.pp b/puppet/environment/vagrant/modules/compiler/manifests/init.pp
index 5e4689855..b1bf78361 100644
--- a/puppet/environment/vagrant/modules/compiler/manifests/init.pp
+++ b/puppet/environment/vagrant/modules/compiler/manifests/init.pp
@@ -5,7 +5,6 @@
 class compiler {
     ## ensure log directory, package dependencies
     require system::log_directory
-    contain package::webcompilers
 
     ## configure webcompilers
     require system::webcompiler_directory
diff --git a/puppet/environment/vagrant/modules/compiler/manifests/webcompilers.pp b/puppet/environment/vagrant/modules/compiler/manifests/webcompilers.pp
index ef280278b..c90316f67 100644
--- a/puppet/environment/vagrant/modules/compiler/manifests/webcompilers.pp
+++ b/puppet/environment/vagrant/modules/compiler/manifests/webcompilers.pp
@@ -2,6 +2,9 @@
 ### webcompilers.pp, create webcompiler services.
 ###
 class compiler::webcompilers {
+    include package::react_presets
+    include package::webcompilers
+
     ## variables
     $hiera_general   = lookup('general')
     $root_dir        = $hiera_general['root']
@@ -35,6 +38,10 @@
         file { "/etc/init/${compiler}.conf":
             ensure  => file,
             content => dos2unix(template($template_path)),
+            require => [
+                Class['package::webcompilers'],
+                Class['package::react_presets'],
+            ],
         }
 
         ## dos2unix upstart: convert clrf (windows to linux) in case host
@@ -43,6 +50,10 @@
             ensure  => file,
             content => dos2unix(template("${compiler_dir}/${compiler}")),
             mode    => '0755',
+            require => [
+                Class['package::webcompilers'],
+                Class['package::react_presets'],
+            ],
         }
     }
 }
\ No newline at end of file