From 95343d26c8d2cc9789b87a77748b3e7becd548ca Mon Sep 17 00:00:00 2001 From: "carey.xu" Date: Fri, 18 Sep 2015 14:55:04 +0800 Subject: separate the mgmt vip from public vip, remove HA_VIP Change-Id: Iaa877b7ce93ba9c12bc9be6f3bd101779f07ae9c JIRA: COMPASS-51 --- deploy/adapters/ansible/roles/glance/templates/glance-api.conf | 4 ++-- deploy/adapters/ansible/roles/glance/templates/glance-registry.conf | 4 ++-- deploy/adapters/ansible/roles/glance/templates/image_upload.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'deploy/adapters/ansible/roles/glance') diff --git a/deploy/adapters/ansible/roles/glance/templates/glance-api.conf b/deploy/adapters/ansible/roles/glance/templates/glance-api.conf index 3046ab37..737b9a3a 100644 --- a/deploy/adapters/ansible/roles/glance/templates/glance-api.conf +++ b/deploy/adapters/ansible/roles/glance/templates/glance-api.conf @@ -653,8 +653,8 @@ connection = mysql://glance:{{ GLANCE_DBPASS }}@{{ db_host }}/glance #db_max_retries = 20 [keystone_authtoken] -auth_uri = http://{{ HA_VIP }}:5000/v2.0 -identity_uri = http://{{ HA_VIP }}:35357 +auth_uri = http://{{ internal_vip.ip }}:5000/v2.0 +identity_uri = http://{{ internal_vip.ip }}:35357 admin_tenant_name = service admin_user = glance admin_password = {{ GLANCE_PASS }} diff --git a/deploy/adapters/ansible/roles/glance/templates/glance-registry.conf b/deploy/adapters/ansible/roles/glance/templates/glance-registry.conf index 8d731a24..1fedb0b5 100644 --- a/deploy/adapters/ansible/roles/glance/templates/glance-registry.conf +++ b/deploy/adapters/ansible/roles/glance/templates/glance-registry.conf @@ -173,8 +173,8 @@ connection = mysql://glance:{{ GLANCE_DBPASS }}@{{ db_host }}/glance #db_max_retries = 20 [keystone_authtoken] -auth_uri = http://{{ HA_VIP }}:5000/v2.0 -identity_uri = http://{{ HA_VIP }}:35357 +auth_uri = http://{{ internal_vip.ip }}:5000/v2.0 +identity_uri = http://{{ internal_vip.ip }}:35357 admin_tenant_name = service admin_user = glance admin_password = {{ GLANCE_PASS }} diff --git a/deploy/adapters/ansible/roles/glance/templates/image_upload.sh b/deploy/adapters/ansible/roles/glance/templates/image_upload.sh index 9dd1fa8d..985707a4 100644 --- a/deploy/adapters/ansible/roles/glance/templates/image_upload.sh +++ b/deploy/adapters/ansible/roles/glance/templates/image_upload.sh @@ -1,2 +1,2 @@ sleep 10 -glance --os-username=admin --os-password={{ ADMIN_PASS }} --os-tenant-name=admin --os-auth-url=http://{{ HA_VIP }}:35357/v2.0 image-create --name="cirros" --disk-format=qcow2 --container-format=bare --is-public=true < /opt/{{ build_in_image_name }} && touch glance.import.completed +glance --os-username=admin --os-password={{ ADMIN_PASS }} --os-tenant-name=admin --os-auth-url=http://{{ internal_vip.ip }}:35357/v2.0 image-create --name="cirros" --disk-format=qcow2 --container-format=bare --is-public=true < /opt/{{ build_in_image_name }} && touch glance.import.completed -- cgit 1.2.3-korg