Merge "Use port variable replace 5000 and 35357"

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

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 }}