openstack
/
kolla-ansible
Code Issues Proposed changes

Merge "Fix that cyborg conductor failed to communicate with placement"

This commit is contained in:
Zuul 2020-04-21 18:57:14 +00:00 committed by Gerrit Code Review
parent 5273828fae 4f1e05530c
commit 6a49e4d30b
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ansible/roles/cyborg/templates/cyborg.conf.j2
View File

@ -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 }}

5
releasenotes/notes/add-placement-auth-into-cyborg-conductor-54b452e218bfb9ab.yaml Normal file
View File

@ -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>`__.