From d3705b3df3eaa4e421b651ce4de063669d1ebc8e Mon Sep 17 00:00:00 2001
From: Atul Moghe <amoghe@juniper.net>
Date: Wed, 9 Nov 2016 15:37:10 -0800
Subject: [PATCH] HA related variables were used before initialization.
 Closes-Bug:#1639915

Change-Id: I7ae1d09836805e270502e623fd192d9f23bd63ef
---
 .../compute/scripts/compute-server-setup.sh                | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/contrail_provisioning/compute/scripts/compute-server-setup.sh b/contrail_provisioning/compute/scripts/compute-server-setup.sh
index 70fed579..ecb21881 100755
--- a/contrail_provisioning/compute/scripts/compute-server-setup.sh
+++ b/contrail_provisioning/compute/scripts/compute-server-setup.sh
@@ -75,6 +75,10 @@ fi
 source /etc/contrail/ctrl-details
 HYPERVISOR=${HYPERVISOR:-"libvirt"}
 
+INTERNAL_VIP=${INTERNAL_VIP:-none}
+CONTRAIL_INTERNAL_VIP=${CONTRAIL_INTERNAL_VIP:-none}
+EXTERNAL_VIP=${EXTERNAL_VIP:-$INTERNAL_VIP}
+
 if [ $CONTROLLER != $COMPUTE ] ; then
     openstack-config --del /etc/nova/nova.conf database connection
     openstack-config --set /etc/nova/nova.conf DEFAULT auth_strategy keystone
@@ -487,9 +491,6 @@ if [ $VMWARE_IP ]; then
 fi
 
 # Openstack HA specific configs
-INTERNAL_VIP=${INTERNAL_VIP:-none}
-CONTRAIL_INTERNAL_VIP=${CONTRAIL_INTERNAL_VIP:-none}
-EXTERNAL_VIP=${EXTERNAL_VIP:-$INTERNAL_VIP}
 AMQP_PORT=5672
 if [ "$CONTRAIL_INTERNAL_VIP" == "$AMQP_SERVER" ] || [ "$INTERNAL_VIP" == "$AMQP_SERVER" ]; then
     AMQP_PORT=5673