stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #446 from enovance/fix-usermod

Browse Source 
fix usermod path
This commit is contained in:
Emilien Macchi 2014-04-26 14:54:50 +02:00
commit f8de2fb334
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/compute/hypervisor.pp
View File

@ -147,6 +147,7 @@ Host *
ensure_resource ('exec','add-nova-to-group', { ensure_resource ('exec','add-nova-to-group', {
'command' => 'usermod -a -G cephkeyring nova', 'command' => 'usermod -a -G cephkeyring nova',
'path' => ['/usr/sbin', '/sbin'],
'unless' => 'groups nova | grep cephkeyring' 'unless' => 'groups nova | grep cephkeyring'
}) })

2
manifests/volume/backend/rbd.pp
View File

@ -82,7 +82,7 @@ define cloud::volume::backend::rbd (
ensure_resource ('exec','add-cinder-to-group', { ensure_resource ('exec','add-cinder-to-group', {
'command' => 'usermod -a -G cephkeyring cinder', 'command' => 'usermod -a -G cephkeyring cinder',
'path' => ['/usr/bin', '/bin'], 'path' => ['/usr/sbin', '/sbin'],
'unless' => 'groups cinder | grep cephkeyring' 'unless' => 'groups cinder | grep cephkeyring'
}) })

3
spec/classes/cloud_compute_hypervisor_spec.rb
View File

@ -239,7 +239,8 @@ describe 'cloud::compute::hypervisor' do
should contain_group('cephkeyring').with(:ensure => 'present') should contain_group('cephkeyring').with(:ensure => 'present')
should contain_exec('add-nova-to-group').with( should contain_exec('add-nova-to-group').with(
:command => 'usermod -a -G cephkeyring nova', :command => 'usermod -a -G cephkeyring nova',
:unless => 'groups nova | grep cephkeyring' :unless => 'groups nova | grep cephkeyring',
:path => ['/usr/sbin', '/sbin']
) )
end end

2
spec/classes/cloud_volume_storage_spec.rb
View File

@ -111,7 +111,7 @@ describe 'cloud::volume::storage' do
should contain_group('cephkeyring').with(:ensure => 'present') should contain_group('cephkeyring').with(:ensure => 'present')
should contain_exec('add-cinder-to-group').with( should contain_exec('add-cinder-to-group').with(
:command => 'usermod -a -G cephkeyring cinder', :command => 'usermod -a -G cephkeyring cinder',
:path => ['/usr/bin', '/bin'], :path => ['/usr/sbin', '/sbin'],
:unless => 'groups cinder | grep cephkeyring' :unless => 'groups cinder | grep cephkeyring'
) )
end end