openstack/kolla-ansible
Code Issues Proposed changes

Merge "Correct Murano keystone_authtoken option name"

Browse Source
This commit is contained in:
Jenkins 2016-09-07 13:54:19 +00:00 committed by Gerrit Code Review
commit c9307494c4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/roles/murano/templates/murano.conf.j2
View File

@ -19,13 +19,13 @@ max_retries = -1
[keystone_authtoken] [keystone_authtoken]
auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }} 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 auth_type = password
project_domain_id = default project_domain_id = default
user_domain_id = default user_domain_id = default
project_name = service admin_tenant_name = service
username = {{ murano_keystone_user }} admin_user = {{ murano_keystone_user }}
password = {{ murano_keystone_password }} admin_password = {{ murano_keystone_password }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}