Fix resource ordering for neutron-ovs-cleanup service
In RDO neutron-ovs-cleanup service script is packaged in openstack-neutron package instead of openstack-neutron-openvswitch. So, we need to wait for openstack-neutron packages installation before managing neutron-ovs-cleanup service. This commit could be reverted when bug [0] is resolved. [0] - https://bugzilla.redhat.com/show_bug.cgi?id=1065826 Change-Id: I6bb31a74fee883dfb35ea71b92ff37d24b4eaab5
This commit is contained in:
parent
6613d05d3f
commit
298b75df48
@ -315,8 +315,11 @@ class neutron::agents::ml2::ovs (
|
||||
|
||||
if $::neutron::params::ovs_cleanup_service {
|
||||
service { 'ovs-cleanup-service':
|
||||
name => $::neutron::params::ovs_cleanup_service,
|
||||
enable => $enabled,
|
||||
name => $::neutron::params::ovs_cleanup_service,
|
||||
enable => $enabled,
|
||||
# TODO: Remove this require once ovs-cleanup service
|
||||
# script is packaged in neutron-openvswitch package
|
||||
require => Package['neutron'],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -320,7 +320,7 @@ describe 'neutron::agents::ml2::ovs' do
|
||||
is_expected.to contain_service('ovs-cleanup-service').with(
|
||||
:name => platform_params[:ovs_cleanup_service],
|
||||
:enable => true
|
||||
)
|
||||
).that_requires('Package[neutron]')
|
||||
is_expected.to contain_package('neutron-ovs-agent').that_requires('Anchor[neutron::install::begin]')
|
||||
is_expected.to contain_package('neutron-ovs-agent').that_notifies('Anchor[neutron::install::end]')
|
||||
end
|
||||
|
Loading…
x
Reference in New Issue
Block a user