From 97bbfd447f8b9976db0c8bece9253d3be616abe8 Mon Sep 17 00:00:00 2001 From: zhubingbing Date: Fri, 20 Jan 2017 16:05:48 +0000 Subject: [PATCH] Use port variable replace 5000 and 35357 Change-Id: If6cc00f9e2a913bce234b0e24a1453098523234d --- ansible/roles/karbor/templates/karbor.conf.j2 | 8 ++++---- .../karbor/templates/providers.d/openstack-infra.conf.j2 | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ansible/roles/karbor/templates/karbor.conf.j2 b/ansible/roles/karbor/templates/karbor.conf.j2 index 62b1640cf2..90dd534c95 100644 --- a/ansible/roles/karbor/templates/karbor.conf.j2 +++ b/ansible/roles/karbor/templates/karbor.conf.j2 @@ -16,11 +16,11 @@ max_retries = -1 user_domain_id = default username = {{ karbor_keystone_user }} password = {{ karbor_keystone_password }} -auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:35357 +auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} auth_type = password [clients_keystone] -auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:5000 +auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }} [karbor_client] version = 1 @@ -28,8 +28,8 @@ service_type = data-protect service_name = karbor [keystone_authtoken] -auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:5000 -auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:35357 +auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }} +auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} project_domain_name = Default auth_type = password project_domain_id = default diff --git a/ansible/roles/karbor/templates/providers.d/openstack-infra.conf.j2 b/ansible/roles/karbor/templates/providers.d/openstack-infra.conf.j2 index 577f797ce2..a51b3c6b67 100644 --- a/ansible/roles/karbor/templates/providers.d/openstack-infra.conf.j2 +++ b/ansible/roles/karbor/templates/providers.d/openstack-infra.conf.j2 @@ -9,7 +9,7 @@ plugin=karbor-server-protection-plugin bank=karbor-swift-bank-plugin [swift_client] -swift_auth_url={{ internal_protocol }}://{{ kolla_internal_fqdn }}:5000/v2.0/ +swift_auth_url={{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v2.0/ swift_auth_version=2 swift_user=admin swift_key={{ keystone_admin_password }}