openstack/puppet-ironic
Code Issues Proposed changes

Fix user in sync.pp

Browse Source 
The bug[0] is fixed, so we can fix the user.

[0] https://bugs.launchpad.net/cloud-archive/+bug/1450942

Change-Id: I89bdeec3f9723605acad29b90328ad0479b15ffc
This commit is contained in:
ZhongShengping 2017-04-18 15:05:34 +08:00
parent f3ec8361fc
commit bf00e67901
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/db/sync.pp
View File

@ -18,12 +18,7 @@ class ironic::db::sync(
exec { 'ironic-dbsync': exec { 'ironic-dbsync':
command => "${::ironic::params::dbsync_command} ${extra_params}", command => "${::ironic::params::dbsync_command} ${extra_params}",
path => '/usr/bin', path => '/usr/bin',
# Ubuntu packaging is running dbsync command as root during ironic-common user => 'ironic',
# postinstall script so when Puppet tries to run dbsync again, it fails
# because it is run with ironic user.
# This is a temporary patch until it's changed in Packaging
# https://bugs.launchpad.net/cloud-archive/+bug/1450942
user => 'root',
refreshonly => true, refreshonly => true,
try_sleep => 5, try_sleep => 5,
tries => 10, tries => 10,

4
spec/classes/ironic_db_sync_spec.rb
View File

@ -8,7 +8,7 @@ describe 'ironic::db::sync' do
is_expected.to contain_exec('ironic-dbsync').with( is_expected.to contain_exec('ironic-dbsync').with(
:command => 'ironic-dbsync --config-file /etc/ironic/ironic.conf ', :command => 'ironic-dbsync --config-file /etc/ironic/ironic.conf ',
:path => '/usr/bin', :path => '/usr/bin',
:user => 'root', :user => 'ironic',
:refreshonly => 'true', :refreshonly => 'true',
:try_sleep => 5, :try_sleep => 5,
:tries => 10, :tries => 10,
@ -29,7 +29,7 @@ describe 'ironic::db::sync' do
it { is_expected.to contain_exec('ironic-dbsync').with( it { is_expected.to contain_exec('ironic-dbsync').with(
:command => 'ironic-dbsync --config-file /etc/ironic/ironic.conf --config-file /etc/ironic/ironic_01.conf', :command => 'ironic-dbsync --config-file /etc/ironic/ironic.conf --config-file /etc/ironic/ironic_01.conf',
:path => '/usr/bin', :path => '/usr/bin',
:user => 'root', :user => 'ironic',
:refreshonly => true, :refreshonly => true,
:try_sleep => 5, :try_sleep => 5,
:tries => 10, :tries => 10,