openstack/kolla-ansible
Code Issues Proposed changes

update sahara.conf file for kolla

Browse Source 
The use of [keystone_authtoken] credentials for trust creation is now
 deprecated. refer to [1][2][3]

[1] d16f07ea3c/releasenotes/notes/trustee-conf-section-5994dcd48a9744d7.yaml
[2] https://docs.openstack.org/sahara/latest/configuration/descriptionconfig.html
[3] d60a3b152b/sahara/utils/openstack/keystone.py (L116)

Change-Id: I75002c6221268a3371585cf270dee18186471ef5
This commit is contained in:
wu.chunyang 2018-06-08 15:47:20 +00:00
parent ad3e99f901
commit d59e61a90f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ansible/roles/sahara/templates/sahara.conf.j2
View File

@ -15,12 +15,6 @@ connection = mysql+pymysql://{{ sahara_database_user }}:{{ sahara_database_passw
[keystone_authtoken] [keystone_authtoken]
auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }} auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
project_domain_name = {{ default_project_domain_name }}
project_name = service
user_domain_name = {{ default_user_domain_name }}
username = {{ sahara_keystone_user }}
password = {{ sahara_keystone_password }}
auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
auth_type = password auth_type = password
admin_user = {{ sahara_keystone_user }} admin_user = {{ sahara_keystone_user }}
admin_password = {{ sahara_keystone_password }} admin_password = {{ sahara_keystone_password }}
@ -57,3 +51,11 @@ policy_file = {{ sahara_policy_file }}
[profiler] [profiler]
enabled = False enabled = False
[trustee]
project_domain_name = {{ default_project_domain_name }}
project_name = service
user_domain_name = {{ default_user_domain_name }}
username = {{ sahara_keystone_user }}
password = {{ sahara_keystone_password }}
auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}