openstack/puppet-neutron
Code Issues Proposed changes

Fix resource ordering for neutron-ovs-cleanup service

Browse Source 
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:
iberezovskiy 2016-06-21 17:44:18 +03:00
parent 6613d05d3f
commit 298b75df48
2 changed files with 6 additions and 3 deletions
manifests/agents/ml2
ovs.pp
spec/classes
neutron_agents_ml2_ovs_spec.rb

7
manifests/agents/ml2/ovs.pp

@ -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'],
}
}
}

2
spec/classes/neutron_agents_ml2_ovs_spec.rb

@ -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