From 6765a2d0769e9e68b942f539d7af8d5fbc83eb50 Mon Sep 17 00:00:00 2001 From: Atul Moghe Date: Mon, 14 Nov 2016 11:41:24 -0800 Subject: [PATCH] provision glance api_server knob based on INTERNAL_VIP or CONTROLLER for HA or non-HA case and handled in seperately for ubuntu or rpm for mitaka or prior release Closes-Bug:#1616645 Change-Id: Icdd3e8fe16b84f5234a1fcb63bfd3c94d75b61e7 --- .../openstack/scripts/nova-server-setup.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrail_provisioning/openstack/scripts/nova-server-setup.sh b/contrail_provisioning/openstack/scripts/nova-server-setup.sh index b2231aa6..913fa482 100755 --- a/contrail_provisioning/openstack/scripts/nova-server-setup.sh +++ b/contrail_provisioning/openstack/scripts/nova-server-setup.sh @@ -444,7 +444,11 @@ if [ "$INTERNAL_VIP" != "none" ]; then openstack-config --set /etc/nova/nova.conf DEFAULT $ADMIN_AUTH_URL $AUTH_PROTOCOL://$INTERNAL_VIP:5000/$KEYSTONE_VERSION/ openstack-config --set /etc/nova/nova.conf DEFAULT $OS_URL ${QUANTUM_PROTOCOL}://$INTERNAL_VIP:9696/ openstack-config --set /etc/nova/nova.conf DEFAULT image_service nova.image.glance.GlanceImageService - openstack-config --set /etc/nova/nova.conf DEFAULT glance_api_servers $INTERNAL_VIP:9292 + if [ $is_mitaka_or_above -eq 1 ]; then + openstack-config --set /etc/nova/nova.conf glance api_servers $INTERNAL_VIP:9292 + else + openstack-config --set /etc/nova/nova.conf DEFAULT glance_api_servers $INTERNAL_VIP:9292 + fi openstack-config --set /etc/nova/nova.conf DEFAULT service_down_time 90 openstack-config --set /etc/nova/nova.conf DEFAULT scheduler_max_attempts 10 openstack-config --set /etc/nova/nova.conf database idle_timeout 180