openstack/puppet-neutron
Code Issues Proposed changes

Merge "Use oslo::coordination to manage tooz backend package"

Browse Source
This commit is contained in:
Zuul
2021-12-09 00:29:44 +00:00
committed by Gerrit Code Review
parent 7f859e705c 52935b3e69
commit c4c12c1667
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/deps.pp
View File

@@ -97,6 +97,10 @@ class neutron::deps {
# before service startup # before service startup
Oslo::Cache<||> -> Anchor['neutron::service::begin'] Oslo::Cache<||> -> Anchor['neutron::service::begin']
# all coordination settings should be applied and all packages should be
# installed before service startup
Oslo::Coordination<||> -> Anchor['neutron::service::begin']
# all db settings should be applied and all packages should be installed # all db settings should be applied and all packages should be installed
# before dbsync starts # before dbsync starts
Oslo::Db<||> -> Anchor['neutron::dbsync::begin'] Oslo::Db<||> -> Anchor['neutron::dbsync::begin']

9
manifests/plugins/ml2/networking_ansible.pp
View File

@@ -54,5 +54,12 @@ class neutron::plugins::ml2::networking_ansible(
) )
create_resources(neutron::plugins::ml2::networking_ansible_host, $host_configs) create_resources(neutron::plugins::ml2::networking_ansible_host, $host_configs)
neutron_plugin_ml2 {'ml2_ansible/coordination_uri': value => $coordination_uri; } oslo::coordination { 'neutron_plugin_ml2':
backend_url => $coordination_uri,
manage_config => false,
}
neutron_plugin_ml2 {
'ml2_ansible/coordination_uri': value => $coordination_uri;
}
} }

5
spec/classes/neutron_plugins_ml2_networking_ansible_spec.rb
View File

@@ -41,6 +41,11 @@ describe 'neutron::plugins::ml2::networking_ansible' do
end end
it 'should configure non-host config' do it 'should configure non-host config' do
should contain_oslo__coordination('neutron_plugin_ml2').with(
:backend_url => 'etcd://127.0.0.1:2379',
:manage_config => false,
)
should contain_neutron_plugin_ml2('ml2_ansible/coordination_uri').with_value('etcd://127.0.0.1:2379') should contain_neutron_plugin_ml2('ml2_ansible/coordination_uri').with_value('etcd://127.0.0.1:2379')
end end