From ea4b0990330bc54fa8bde4e9ed7591d42dc01eef Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Fri, 26 Sep 2014 21:38:45 -0700 Subject: [PATCH] Allow for non-linux --- manifests/mcollective.pp | 2 +- manifests/mcollective/application.pp | 2 +- spec/classes/mcollective/application_spec.rb | 8 ++++---- spec/classes/mcollective_spec.rb | 18 +++++++++--------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/manifests/mcollective.pp b/manifests/mcollective.pp index 2c2c0ff9..56ebf44d 100644 --- a/manifests/mcollective.pp +++ b/manifests/mcollective.pp @@ -10,7 +10,7 @@ File { ensure => present, owner => 'root', - group => 'root', + group => '0', mode => '0644', } # Install the agent and its ddl file diff --git a/manifests/mcollective/application.pp b/manifests/mcollective/application.pp index 064a606e..acc2a591 100644 --- a/manifests/mcollective/application.pp +++ b/manifests/mcollective/application.pp @@ -10,7 +10,7 @@ File { ensure => present, owner => 'root', - group => 'root', + group => '0', mode => '0644', } # Install the agent and its ddl file diff --git a/spec/classes/mcollective/application_spec.rb b/spec/classes/mcollective/application_spec.rb index 321e1b20..0a1d4c1a 100644 --- a/spec/classes/mcollective/application_spec.rb +++ b/spec/classes/mcollective/application_spec.rb @@ -13,7 +13,7 @@ it { should contain_file("/opt/puppet/libexec/mcollective/mcollective/application/r10k.rb").with( 'ensure' => 'present', 'owner' => 'root', - 'group' => 'root', + 'group' => '0', 'mode' => '0644', 'source' => 'puppet:///modules/r10k/application/r10k.rb' ) @@ -21,7 +21,7 @@ it { should contain_file("/opt/puppet/libexec/mcollective/mcollective/agent/r10k.ddl").with( 'ensure' => 'present', 'owner' => 'root', - 'group' => 'root', + 'group' => '0', 'mode' => '0644', 'source' => 'puppet:///modules/r10k/agent/r10k.ddl' ) @@ -40,7 +40,7 @@ it { should contain_file("/usr/libexec/mcollective/mcollective/application/r10k.rb").with( 'ensure' => 'present', 'owner' => 'root', - 'group' => 'root', + 'group' => '0', 'mode' => '0644', 'source' => 'puppet:///modules/r10k/application/r10k.rb' ) @@ -48,7 +48,7 @@ it { should contain_file("/usr/libexec/mcollective/mcollective/agent/r10k.ddl").with( 'ensure' => 'present', 'owner' => 'root', - 'group' => 'root', + 'group' => '0', 'mode' => '0644', 'source' => 'puppet:///modules/r10k/agent/r10k.ddl' ) diff --git a/spec/classes/mcollective_spec.rb b/spec/classes/mcollective_spec.rb index 55f3d71c..31e328f3 100644 --- a/spec/classes/mcollective_spec.rb +++ b/spec/classes/mcollective_spec.rb @@ -13,14 +13,14 @@ it { should contain_file("/opt/puppet/libexec/mcollective/mcollective/application/r10k.rb").with( 'ensure' => 'present', 'owner' => 'root', - 'group' => 'root', + 'group' => '0', 'mode' => '0644' ) } it { should contain_file("/opt/puppet/libexec/mcollective/mcollective/agent/r10k.ddl").with( 'ensure' => 'present', 'owner' => 'root', - 'group' => 'root', + 'group' => '0', 'mode' => '0644' ) } @@ -28,7 +28,7 @@ it { should contain_file("/opt/puppet/libexec/mcollective/mcollective/agent/r10k.rb").with( 'ensure' => 'present', 'owner' => 'root', - 'group' => 'root', + 'group' => '0', 'mode' => '0644' ) } @@ -47,14 +47,14 @@ it { should contain_file("/usr/libexec/mcollective/mcollective/application/r10k.rb").with( 'ensure' => 'present', 'owner' => 'root', - 'group' => 'root', + 'group' => '0', 'mode' => '0644' ) } it { should contain_file("/usr/libexec/mcollective/mcollective/agent/r10k.ddl").with( 'ensure' => 'present', 'owner' => 'root', - 'group' => 'root', + 'group' => '0', 'mode' => '0644' ) } @@ -62,7 +62,7 @@ it { should contain_file("/usr/libexec/mcollective/mcollective/agent/r10k.rb").with( 'ensure' => 'present', 'owner' => 'root', - 'group' => 'root', + 'group' => '0', 'mode' => '0644' ) } @@ -82,7 +82,7 @@ it { should contain_file("/usr/share/mcollective/plugins/mcollective/application/r10k.rb").with( 'ensure' => 'present', 'owner' => 'root', - 'group' => 'root', + 'group' => '0', 'mode' => '0644' ) } @@ -90,7 +90,7 @@ it { should contain_file("/usr/share/mcollective/plugins/mcollective/agent/r10k.ddl").with( 'ensure' => 'present', 'owner' => 'root', - 'group' => 'root', + 'group' => '0', 'mode' => '0644' ) } @@ -98,7 +98,7 @@ it { should contain_file("/usr/share/mcollective/plugins/mcollective/agent/r10k.rb").with( 'ensure' => 'present', 'owner' => 'root', - 'group' => 'root', + 'group' => '0', 'mode' => '0644' ) }