From 099a33c87d0fba4d8b9b24479c82178a3827a856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Sun, 20 Oct 2019 19:33:56 +0200
Subject: [PATCH] [train] Finish configuring Zun to use Placement

This also enables Placement when Zun is enabled like Kolla Ansible
already does with Nova.

Change-Id: Id2a09f702e8503b49d2b9e73e06b2ce9f4d168a9
Closes-bug: #1840573
---
 ansible/group_vars/all.yml                 | 2 +-
 ansible/roles/zun/templates/zun.conf.j2    | 4 ++++
 doc/source/reference/compute/zun-guide.rst | 1 -
 etc/kolla/globals.yml                      | 2 +-
 tests/templates/globals-default.j2         | 1 -
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index df50e16131..d456d0a122 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -653,7 +653,7 @@ enable_openvswitch: "{{ enable_neutron | bool and neutron_plugin_agent != 'linux
 enable_ovs_dpdk: "no"
 enable_osprofiler: "no"
 enable_panko: "no"
-enable_placement: "{{ enable_nova | bool }}"
+enable_placement: "{{ enable_nova | bool or enable_zun | bool }}"
 enable_prometheus: "no"
 enable_qdrouterd: "{{ 'yes' if om_rpc_transport == 'amqp' else 'no' }}"
 enable_qinling: "no"
diff --git a/ansible/roles/zun/templates/zun.conf.j2 b/ansible/roles/zun/templates/zun.conf.j2
index e2de4277a4..3e41e9b717 100644
--- a/ansible/roles/zun/templates/zun.conf.j2
+++ b/ansible/roles/zun/templates/zun.conf.j2
@@ -82,6 +82,10 @@ endpoint_type = internalURL
 region_name = {{ openstack_region_name }}
 endpoint_type = internalURL
 
+[placement_client]
+region_name = {{ openstack_region_name }}
+endpoint_type = internalURL
+
 {% if enable_osprofiler | bool %}
 [profiler]
 enabled = true
diff --git a/doc/source/reference/compute/zun-guide.rst b/doc/source/reference/compute/zun-guide.rst
index d0252fa82c..17e9b34c9e 100644
--- a/doc/source/reference/compute/zun-guide.rst
+++ b/doc/source/reference/compute/zun-guide.rst
@@ -20,7 +20,6 @@ following variables:
    enable_zun: "yes"
    enable_kuryr: "yes"
    enable_etcd: "yes"
-   enable_placement: "yes"
    docker_configure_for_zun: "yes"
 
 Docker reconfiguration requires reboostrapping before deploy.
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index cea4cb9c08..cef3e8f9b6 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -324,7 +324,7 @@
 #enable_ovs_dpdk: "no"
 #enable_osprofiler: "no"
 #enable_panko: "no"
-#enable_placement: "{{ enable_nova | bool }}"
+#enable_placement: "{{ enable_nova | bool or enable_zun | bool }}"
 #enable_prometheus: "no"
 #enable_qdrouterd: "{{ 'yes' if om_rpc_transport == 'amqp' else 'no' }}"
 #enable_qinling: "no"
diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index 7599fd0cae..614787ca02 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -78,7 +78,6 @@ enable_cinder_backend_lvm: "yes"
 enable_zun: "yes"
 enable_kuryr: "yes"
 enable_etcd: "yes"
-enable_placement: "yes"
 docker_configure_for_zun: "yes"
 {% endif %}