openstack/puppet-neutron
Code Issues Proposed changes

Run db-sync before we manage neutron services

Browse Source 
This commit puts in place a dependency between db-sync and the
  neutron-ovs-agent-service service.

  This is specially being done because in Puppet 4 tests we are seeing
  the neutron-ovs-agent-service trying to start before the int-br-ex
  related rows are being added to the neutron db.

Change-Id: Ifc3f40ae1cb71c215b8a0bf6cd5f6d05101a6168
This commit is contained in:
Cody Herriges
2016-04-12 12:28:30 -07:00
parent 34da5abac0
commit 1941fd80fc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/agents/ml2/ovs.pp
View File

@@ -297,7 +297,7 @@ class neutron::agents::ml2::ovs (
name => $::neutron::params::ovs_agent_service, name => $::neutron::params::ovs_agent_service,
enable => $enabled, enable => $enabled,
require => Class['neutron'], require => Class['neutron'],
tag => 'neutron-service', tag => ['neutron-service', 'neutron-db-sync-service'],
} }
if $::neutron::params::ovs_cleanup_service { if $::neutron::params::ovs_cleanup_service {

2
spec/classes/neutron_agents_ml2_ovs_spec.rb
View File

@@ -75,7 +75,7 @@ describe 'neutron::agents::ml2::ovs' do
:enable => true, :enable => true,
:ensure => 'running', :ensure => 'running',
:require => 'Class[Neutron]', :require => 'Class[Neutron]',
:tag => 'neutron-service', :tag => ['neutron-service', 'neutron-db-sync-service'],
) )
is_expected.to contain_service('neutron-ovs-agent-service').that_subscribes_to( [ 'Package[neutron]', 'Package[neutron-ovs-agent]' ] ) is_expected.to contain_service('neutron-ovs-agent-service').that_subscribes_to( [ 'Package[neutron]', 'Package[neutron-ovs-agent]' ] )
end end