diff --git a/ansible/roles/monasca/templates/monasca-agent-forwarder/agent-forwarder.yml.j2 b/ansible/roles/monasca/templates/monasca-agent-forwarder/agent-forwarder.yml.j2 index fae732552ab7777124906555a1b8e1b598dff0cf..6c6a4a85c5f9c3d2fe23aa60bb7e215130309d00 100644 --- a/ansible/roles/monasca/templates/monasca-agent-forwarder/agent-forwarder.yml.j2 +++ b/ansible/roles/monasca/templates/monasca-agent-forwarder/agent-forwarder.yml.j2 @@ -4,7 +4,7 @@ Api: region_name: {{ openstack_region_name }} username: {{ monasca_agent_user }} password: {{ monasca_agent_password }} - keystone_url: {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v3 + keystone_url: {{ keystone_admin_url }} user_domain_name: Default project_name: {{ monasca_control_plane_project }} project_domain_id: {{ default_project_domain_id }} diff --git a/ansible/roles/monasca/templates/monasca-api/api.conf.j2 b/ansible/roles/monasca/templates/monasca-api/api.conf.j2 index 08fe7cec51907a39ff53926693e47ced70c30efa..d31b83b5aced7a33f2e435430f2566f6a13eddcb 100644 --- a/ansible/roles/monasca/templates/monasca-api/api.conf.j2 +++ b/ansible/roles/monasca/templates/monasca-api/api.conf.j2 @@ -27,8 +27,8 @@ read_only_authorized_roles = {{ monasca_read_only_authorized_roles|join(', ') }} delegate_authorized_roles = {{ monasca_delegate_authorized_roles|join(', ') }} [keystone_authtoken] -www_authenticate_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }} -auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} +www_authenticate_uri = {{ keystone_internal_url }} +auth_url = {{ keystone_admin_url }} auth_type = password project_domain_id = {{ default_project_domain_id }} user_domain_id = {{ default_user_domain_id }} diff --git a/ansible/roles/monasca/templates/monasca-log-api/log-api.conf.j2 b/ansible/roles/monasca/templates/monasca-log-api/log-api.conf.j2 index 8cd5073a8b22ed711cc2ca6c52a2641a2134b08b..8b9e68ba40215dab5092a45bcde906e9b9155fd3 100644 --- a/ansible/roles/monasca/templates/monasca-log-api/log-api.conf.j2 +++ b/ansible/roles/monasca/templates/monasca-log-api/log-api.conf.j2 @@ -27,8 +27,8 @@ agent_roles = {{ monasca_agent_authorized_roles|join(', ') }} delegate_roles = {{ monasca_delegate_authorized_roles|join(', ') }} [keystone_authtoken] -www_authenticate_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }} -auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} +www_authenticate_uri = {{ keystone_internal_url }} +auth_url = {{ keystone_admin_url }} auth_type = password project_domain_id = {{ default_project_domain_id }} user_domain_id = {{ default_user_domain_id }}