From 39adda41b6166f7137946b3e7ca5f70b17bdccd7 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@betacloud-solutions.de>
Date: Thu, 28 Sep 2017 09:29:49 +0200
Subject: [PATCH] Add placement section to neutron.conf

This is required by routed provider networks.

Change-Id: I529c310c5119e68343114dc1ef12d7d8cc7e2ce1
---
 ansible/group_vars/all.yml                      |  3 ++-
 ansible/roles/neutron/templates/neutron.conf.j2 | 11 +++++++++++
 ansible/roles/nova-hyperv/defaults/main.yml     |  1 -
 ansible/roles/nova/defaults/main.yml            |  2 --
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 4c7a2a7abc..837f5ccedb 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -435,10 +435,11 @@ enable_vmtp: "no"
 enable_watcher: "no"
 enable_zun: "no"
 
+designate_keystone_user: "designate"
 ironic_keystone_user: "ironic"
 neutron_keystone_user: "neutron"
 nova_keystone_user: "nova"
-designate_keystone_user: "designate"
+placement_keystone_user: "placement"
 
 # Nova fake driver and the number of fake driver per compute node
 enable_nova_fake: "no"
diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2
index d1aa1d8681..f831a63314 100644
--- a/ansible/roles/neutron/templates/neutron.conf.j2
+++ b/ansible/roles/neutron/templates/neutron.conf.j2
@@ -150,3 +150,14 @@ connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch
 [qos]
 notification_drivers = {{ neutron_notification_drivers|map(attribute='name')|join(',') }}
 {% endif %}
+
+[placement]
+auth_type = password
+auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
+username = {{ placement_keystone_user }}
+password = {{ placement_keystone_password }}
+user_domain_name = {{ default_user_domain_name }}
+project_name = service
+project_domain_name = {{ default_project_domain_name }}
+os_region_name = {{ openstack_region_name }}
+os_interface = internal
diff --git a/ansible/roles/nova-hyperv/defaults/main.yml b/ansible/roles/nova-hyperv/defaults/main.yml
index 0b1f9f923b..75140effd5 100644
--- a/ansible/roles/nova-hyperv/defaults/main.yml
+++ b/ansible/roles/nova-hyperv/defaults/main.yml
@@ -1,5 +1,4 @@
 ---
-placement_keystone_user: "placement"
 msi_dir: "%SYSTEMDRIVE%\\OpenStack\\MSIs"
 log_dir: "%SYSTEMDRIVE%\\OpenStack\\Log"
 freerdp_msi_url: "https://cloudbase.it/downloads/FreeRDPWebConnect.msi"
diff --git a/ansible/roles/nova/defaults/main.yml b/ansible/roles/nova/defaults/main.yml
index 1b7970dfc3..f46add8dc9 100644
--- a/ansible/roles/nova/defaults/main.yml
+++ b/ansible/roles/nova/defaults/main.yml
@@ -235,8 +235,6 @@ placement_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{
 
 nova_logging_debug: "{{ openstack_logging_debug }}"
 
-placement_keystone_user: "placement"
-
 openstack_nova_auth: "{{ openstack_auth }}"
 openstack_placement_auth: "{{ openstack_auth }}"