openstack/kolla-ansible
Code Issues Proposed changes

Use port variable replace 5000 and 35357

Browse Source 
Change-Id: If6cc00f9e2a913bce234b0e24a1453098523234d
This commit is contained in:
zhubingbing 2017-01-20 16:05:48 +00:00
parent 2d32083a27
commit 97bbfd447f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,11 +16,11 @@ max_retries = -1
user_domain_id = default user_domain_id = default
username = {{ karbor_keystone_user }} username = {{ karbor_keystone_user }}
password = {{ karbor_keystone_password }} 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 auth_type = password
[clients_keystone] [clients_keystone]
auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:5000 auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
[karbor_client] [karbor_client]
version = 1 version = 1
@ -28,8 +28,8 @@ service_type = data-protect
service_name = karbor service_name = karbor
[keystone_authtoken] [keystone_authtoken]
auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:5000 auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:35357 auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
project_domain_name = Default project_domain_name = Default
auth_type = password auth_type = password
project_domain_id = default project_domain_id = default

2
ansible/roles/karbor/templates/providers.d/openstack-infra.conf.j2
View File

@ -9,7 +9,7 @@ plugin=karbor-server-protection-plugin
bank=karbor-swift-bank-plugin bank=karbor-swift-bank-plugin
[swift_client] [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_auth_version=2
swift_user=admin swift_user=admin
swift_key={{ keystone_admin_password }} swift_key={{ keystone_admin_password }}