openstack
/
puppet-tripleo
Code Issues Proposed changes

Make sure neutron [placement] config section is set 

Even if the hiera keys for the [placement] config section
get created [1], the section is not being created/filles as the
::neutron::server::placement class is not included anywhere.

This includes ::neutron::server::placement to have the section
create in the neutron.conf

[1] https://github.com/openstack/tripleo-heat-templates/blob/master/deployment/neutron/neutron-api-container-puppet.yaml#L391-L400

Conflicts:
  manifests/profile/base/neutron/server.pp

Change-Id: Iededba802be4b88e3b232a7b7474f2f981e40a08
(cherry picked from commit efbdd0f21b)
This commit is contained in:
Martin Schuppert 2019-12-13 09:22:57 +01:00
parent 6969a3f5f3
commit 2df86b9879
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/profile/base/neutron/server.pp
View File

@ -147,6 +147,7 @@ class tripleo::profile::base::neutron::server (
if $step >= 4 and $sync_db or $step >= 5 and !$sync_db {
include ::neutron::server::notifications
include ::neutron::server::placement
# We need to override the hiera value neutron::server::sync_db which is set
# to true
class { '::neutron::server':

6
spec/classes/tripleo_profile_base_neutron_server_spec.rb
View File

@ -43,6 +43,7 @@ eos
is_expected.to contain_class('tripleo::profile::base::neutron::authtoken')
is_expected.to_not contain_class('tripleo::profile::base::apache')
is_expected.to_not contain_class('neutron::server::notifications')
is_expected.to_not contain_class('neutron::server::placement')
is_expected.to_not contain_class('neutron::server')
is_expected.to_not contain_class('neutron::quota')
end
@ -59,6 +60,7 @@ eos
is_expected.to contain_class('tripleo::profile::base::neutron::authtoken')
is_expected.to contain_class('tripleo::profile::base::apache')
is_expected.to_not contain_class('neutron::server::notifications')
is_expected.to_not contain_class('neutron::server::placement')
is_expected.to_not contain_class('neutron::server')
is_expected.to_not contain_class('neutron::quota')
end
@ -75,6 +77,7 @@ eos
is_expected.to contain_class('tripleo::profile::base::neutron::authtoken')
is_expected.to_not contain_class('tripleo::profile::base::apache')
is_expected.to_not contain_class('neutron::server::notifications')
is_expected.to_not contain_class('neutron::server::placement')
is_expected.to_not contain_class('neutron::server')
is_expected.to_not contain_class('neutron::quota')
end
@ -91,6 +94,7 @@ eos
is_expected.to contain_class('tripleo::profile::base::neutron::authtoken')
is_expected.to contain_class('tripleo::profile::base::apache')
is_expected.to contain_class('neutron::server::notifications')
is_expected.to contain_class('neutron::server::placement')
is_expected.to contain_class('neutron::server').with(
:sync_db => true,
:l3_ha => false,
@ -110,6 +114,7 @@ eos
is_expected.to contain_class('tripleo::profile::base::neutron::authtoken')
is_expected.to contain_class('tripleo::profile::base::apache')
is_expected.to_not contain_class('neutron::server::notifications')
is_expected.to_not contain_class('neutron::server::placement')
is_expected.to_not contain_class('neutron::server')
is_expected.to_not contain_class('neutron::quota')
end
@ -126,6 +131,7 @@ eos
is_expected.to contain_class('tripleo::profile::base::neutron::authtoken')
is_expected.to contain_class('tripleo::profile::base::apache')
is_expected.to contain_class('neutron::server::notifications')
is_expected.to contain_class('neutron::server::placement')
is_expected.to contain_class('neutron::server').with(
:sync_db => false,
:l3_ha => false,

1
spec/fixtures/hieradata/default.yaml vendored
View File

@ -103,6 +103,7 @@ horizon_node_names:
neutron::rabbit_password: 'password'
neutron::keystone::authtoken::password: 'password'
neutron::server::notifications::password: 'password'
neutron::server::placement::password: 'password'
# oslo.messaging related
oslo_messaging_rpc_password: 'password'
oslo_messaging_notify_password: 'password'