diff options
| author | Jim Rollenhagen <jim@jimrollenhagen.com> | 2018-12-18 13:36:18 -0500 |
|---|---|---|
| committer | Jim Rollenhagen <jim@jimrollenhagen.com> | 2019-03-06 15:08:26 -0500 |
| commit | 2e4e60503a9cf8855fa742b58112f1cfd97cff62 (patch) | |
| tree | 21f6354011c26a2672dacc1766059d500d1da658 /ansible/roles/trove/templates/trove.conf.j2 | |
| parent | 98e541572212f61e45f9a703feba1c39660f17ee (diff) | |
| download | kolla-ansible-2e4e60503a9cf8855fa742b58112f1cfd97cff62.tar.gz kolla-ansible-2e4e60503a9cf8855fa742b58112f1cfd97cff62.zip | |
Use keystone_*_url var in all configs
We're duplicating code to build the keystone URLs in nearly every
config, where we've already done it in group_vars. Replace the
redundancy with a variable that does the same thing.
Change-Id: I207d77870e2535c1cdcbc5eaf704f0448ac85a7a
Diffstat (limited to 'ansible/roles/trove/templates/trove.conf.j2')
| -rw-r--r-- | ansible/roles/trove/templates/trove.conf.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ansible/roles/trove/templates/trove.conf.j2 b/ansible/roles/trove/templates/trove.conf.j2 index 6dc71f38f..39dcbc9d0 100644 --- a/ansible/roles/trove/templates/trove.conf.j2 +++ b/ansible/roles/trove/templates/trove.conf.j2 @@ -12,7 +12,7 @@ auth_strategy = keystone transport_url = {{ rpc_transport_url }} -trove_auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3 +trove_auth_url = {{ keystone_internal_url }}/v3 os_region_name = {{ openstack_region_name }} @@ -31,13 +31,13 @@ network_label_regex = .* connection = mysql+pymysql://{{ trove_database_user }}:{{ trove_database_password }}@{{ trove_database_address }}/{{ trove_database_name }} [keystone_authtoken] -www_authenticate_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }} +www_authenticate_uri = {{ keystone_internal_url }} project_domain_name = {{ default_project_domain_name }} project_name = service user_domain_name = {{ default_user_domain_name }} username = {{ trove_keystone_user }} password = {{ trove_keystone_password }} -auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} +auth_url = {{ keystone_admin_url }} auth_type = password [oslo_messaging_notifications] |