Merge "update sahara.conf file for kolla"

This commit is contained in:
Zuul 2018-07-11 05:23:36 +00:00 committed by Gerrit Code Review
commit 204ad2a205
1 changed files with 8 additions and 6 deletions

View File

@ -15,12 +15,6 @@ connection = mysql+pymysql://{{ sahara_database_user }}:{{ sahara_database_passw
[keystone_authtoken]
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
admin_user = {{ sahara_keystone_user }}
admin_password = {{ sahara_keystone_password }}
@ -57,3 +51,11 @@ policy_file = {{ sahara_policy_file }}
[profiler]
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 }}