Merge "Fix murano authentication configuration options"

This commit is contained in:
Zuul 2018-02-20 08:26:57 +00:00 committed by Gerrit Code Review
commit 915db880b3

View File

@ -17,17 +17,15 @@ engine_workers = {{ openstack_service_workers }}
connection = mysql+pymysql://{{ murano_database_user }}:{{ murano_database_password }}@{{ murano_database_address }}/{{ murano_database_name }} connection = mysql+pymysql://{{ murano_database_user }}:{{ murano_database_password }}@{{ murano_database_address }}/{{ murano_database_name }}
max_retries = -1 max_retries = -1
[keystone]
auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
[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_host = {{ kolla_internal_fqdn }} auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
auth_port = {{ keystone_public_port }} auth_type = password
auth_protocol = {{ internal_protocol }} project_domain_id = {{ default_project_domain_id }}
admin_tenant_name = service user_domain_id = {{ default_user_domain_id }}
admin_user = {{ murano_keystone_user }} project_name = service
admin_password = {{ murano_keystone_password }} username = {{ murano_keystone_user }}
password = {{ murano_keystone_password }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}