From 4717fbea774937fa3ecb69a4d6f75d862e349270 Mon Sep 17 00:00:00 2001
From: Martin Schuppert <mschuppert@redhat.com>
Date: Fri, 13 Dec 2019 09:22:57 +0100
Subject: [PATCH] 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

Depends-On: https://review.opendev.org/700250
Change-Id: Iededba802be4b88e3b232a7b7474f2f981e40a08
---
 manifests/profile/base/neutron/server.pp                 | 1 +
 spec/classes/tripleo_profile_base_neutron_server_spec.rb | 6 ++++++
 spec/fixtures/hieradata/default.yaml                     | 1 +
 3 files changed, 8 insertions(+)

diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp
index 4b3a3c3f7..87782fdd7 100644
--- a/manifests/profile/base/neutron/server.pp
+++ b/manifests/profile/base/neutron/server.pp
@@ -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':
diff --git a/spec/classes/tripleo_profile_base_neutron_server_spec.rb b/spec/classes/tripleo_profile_base_neutron_server_spec.rb
index 918a4205c..6aeb8b2fc 100644
--- a/spec/classes/tripleo_profile_base_neutron_server_spec.rb
+++ b/spec/classes/tripleo_profile_base_neutron_server_spec.rb
@@ -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,
diff --git a/spec/fixtures/hieradata/default.yaml b/spec/fixtures/hieradata/default.yaml
index 4dd732b64..1c6182144 100644
--- a/spec/fixtures/hieradata/default.yaml
+++ b/spec/fixtures/hieradata/default.yaml
@@ -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'