From 4f1e05530c1cdcb15697e3301af08194e451ee69 Mon Sep 17 00:00:00 2001
From: "ya.wang" <wang.ya@99cloud.net>
Date: Mon, 20 Apr 2020 11:14:22 +0800
Subject: [PATCH] Fix that cyborg conductor failed to communicate with
placement
Add placement auth configuration into cyborg conf.
Closes-bug: #1873717
Change-Id: I476a878549507c5d46efef4f8639f57d89737e75
---
ansible/roles/cyborg/templates/cyborg.conf.j2 | 12 ++++++++++++
...-auth-into-cyborg-conductor-54b452e218bfb9ab.yaml | 5 +++++
2 files changed, 17 insertions(+)
create mode 100644 releasenotes/notes/add-placement-auth-into-cyborg-conductor-54b452e218bfb9ab.yaml
diff --git a/ansible/roles/cyborg/templates/cyborg.conf.j2 b/ansible/roles/cyborg/templates/cyborg.conf.j2
index e2014e4c61..14f9e7378d 100644
--- a/ansible/roles/cyborg/templates/cyborg.conf.j2
+++ b/ansible/roles/cyborg/templates/cyborg.conf.j2
@@ -27,6 +27,18 @@ auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn | put_address_in_contex
auth_type = password
cafile = {{ openstack_cacert }}
+[placement]
+auth_type = password
+auth_url = {{ keystone_admin_url }}
+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 }}
+region_name = {{ openstack_region_name }}
+cafile = {{ openstack_cacert }}
+valid_interfaces = internal
+
{% if cyborg_policy_file is defined %}
[oslo_policy]
policy_file = {{ cyborg_policy_file }}
diff --git a/releasenotes/notes/add-placement-auth-into-cyborg-conductor-54b452e218bfb9ab.yaml b/releasenotes/notes/add-placement-auth-into-cyborg-conductor-54b452e218bfb9ab.yaml
new file mode 100644
index 0000000000..a7b47b7a1f
--- /dev/null
+++ b/releasenotes/notes/add-placement-auth-into-cyborg-conductor-54b452e218bfb9ab.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ Fix that the cyborg conductor failed to communicate with placement. See
+ `bug 1873717 <https://bugs.launchpad.net/kolla-ansible/+bug/1873717>`__.