Merge pull request redhat-openstack#280 from thias/master

Set script's group to 0 if script owner is root
xbezdick · Mar 16, 2015 · c4a14b4 · c4a14b4
2 parents 30fbfe1 + 9990f2e
commit c4a14b4
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/manifests/setup.pp b/manifests/setup.pp
@@ -37,6 +37,8 @@
 
   $script_owner = $::osfamily ? { 'windows' => undef, default => $::id }
 
+  $script_group = $script_owner ? { 'root' => '0', default => undef }
+
   $script_mode = $::osfamily ? { 'windows' => undef, default => '0755' }
 
   $script_command = $::osfamily? {
@@ -51,6 +53,7 @@
   file { $script_path:
     ensure => file,
     owner  => $script_owner,
+    group  => $script_group,
     mode   => $script_mode,
     source => "puppet:///modules/concat/${script_name}",
   }