Deal with archive_path is declared by other class

moonape1226 · Dec 6, 2016 · 1c0ce33 · 1c0ce33
1 parent 48f8dd4
commit 1c0ce33
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -25,11 +25,20 @@
       }
 
       include ::archive
-      file { [$install_path, "${install_path}/nomad-${::nomad::version}"]:
-        ensure => directory,
-        owner  => 'root',
-        group  => 0, # 0 instead of root because OS X uses "wheel".
-        mode   => '0555';
+      if ! defined(File[$install_path]) {
+        file { $install_path:
+          ensure => directory,
+          owner  => 'root',
+          group  => 0, # 0 instead of root because OS X uses "wheel".
+          mode   => '0555',
+        }
+      }
+      file { "${install_path}/nomad-${::nomad::version}":
+        ensure  => directory,
+        owner   => 'root',
+        group   => 0, # 0 instead of root because OS X uses "wheel".
+        mode    => '0555',
+        require => File[$install_path],
       }->
       archive { "${install_path}/nomad-${::nomad::version}.${::nomad::download_extension}":
         ensure       => present,