Revert "ironic upgrade: change ownership for ironic-dbsync.log"

This reverts the commit 179690bb93 and
removes the logic to ensure the log file is owned by the ironic user,
as we have been using the ironic user for several cycles and expect
the file is already owned by the proper user.

Change-Id: Ic33db931df0473d352a6840f4c83dba0ff248e07
This commit is contained in:
Takashi Kajinami 2022-02-20 19:48:46 +09:00
parent ba7391775d
commit 31a2a62c53
2 changed files with 0 additions and 18 deletions

View File

@ -20,17 +20,6 @@ class ironic::db::sync(
include ironic::deps include ironic::deps
include ironic::params include ironic::params
# NOTE(dtantsur): previous ironic-dbsync was run as root. it will fail to run
# as "ironic" user, if there is an old log file owned by root. Let's fix it.
# To be removed in Rocky.
file { '/var/log/ironic/ironic-dbsync.log':
ensure => 'present',
owner => $::ironic::params::user,
group => $::ironic::params::group,
# /var/log/ironic comes from ironic-common
require => Anchor['ironic::install::end']
}
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',
@ -46,7 +35,6 @@ class ironic::db::sync(
Anchor['ironic::dbsync::begin'] Anchor['ironic::dbsync::begin']
], ],
notify => Anchor['ironic::dbsync::end'], notify => Anchor['ironic::dbsync::end'],
require => File['/var/log/ironic/ironic-dbsync.log'],
tag => 'openstack-db', tag => 'openstack-db',
} }
} }

View File

@ -22,12 +22,6 @@ describe 'ironic::db::sync' do
:notify => 'Anchor[ironic::dbsync::end]', :notify => 'Anchor[ironic::dbsync::end]',
:tag => 'openstack-db', :tag => 'openstack-db',
) )
is_expected.to contain_file('/var/log/ironic/ironic-dbsync.log').with(
:ensure => 'present',
:owner => 'ironic',
:group => 'ironic',
)
end end
describe "overriding params" do describe "overriding params" do