diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-07 13:54:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-07 13:54:19 +0000 |
| commit | c9307494c4a7f0f3c67874c8ab9e2be753f154f8 (patch) | |
| tree | 2becd22663563afd535f917e75c1ce8355b3a177 | |
| parent | aa16a98c80fa040477ece7fb6d9762c72a08839d (diff) | |
| parent | 663cbfb0633a8f387edf96cca10d82f6bee5344d (diff) | |
| download | kolla-c9307494c4a7f0f3c67874c8ab9e2be753f154f8.tar.gz kolla-c9307494c4a7f0f3c67874c8ab9e2be753f154f8.zip | |
Merge "Correct Murano keystone_authtoken option name"
| -rw-r--r-- | ansible/roles/murano/templates/murano.conf.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ansible/roles/murano/templates/murano.conf.j2 b/ansible/roles/murano/templates/murano.conf.j2 index 08e9e4ebb..fab7554b4 100644 --- a/ansible/roles/murano/templates/murano.conf.j2 +++ b/ansible/roles/murano/templates/murano.conf.j2 @@ -19,13 +19,13 @@ max_retries = -1 [keystone_authtoken] auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }} -auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} +identity_uri = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} auth_type = password project_domain_id = default user_domain_id = default -project_name = service -username = {{ murano_keystone_user }} -password = {{ murano_keystone_password }} +admin_tenant_name = service +admin_user = {{ murano_keystone_user }} +admin_password = {{ murano_keystone_password }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} |