#2932: move 'package::webcompilers' into 'webcompilers.pp'

jeff1evesque · Mar 7, 2017 · 09eaad6 · 09eaad6
1 parent 6fbd7ca
commit 09eaad6
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git 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
@@ -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'],
+            ],
         }
     }
 }
diff --git 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
@@ -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'],
+            ],
         }
     }
 }