summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2018-04-25 18:12:02 -0400
committerMarco Platania <platania@research.att.com>2018-04-25 18:12:02 -0400
commitb707dfad39f827945d9614a71150bf8f9e8f81e5 (patch)
tree918bbdd362fdd90453c29687c9c53b5bb8c53f95
parent93d4028cbb58e867e703ea02ea84e7f0f4fe81e0 (diff)
Fix order of operations in OOF init
- Clone the OOF repo before rebooting the VM (clone operation was previously unreachable in Openstack labs) Change-Id: I019645fea5ab262168aedaa4c36ae56c96f65e8e Issue-ID: INT-444 Signed-off-by: Marco Platania <platania@research.att.com>
-rw-r--r--boot/oof_install.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/boot/oof_install.sh b/boot/oof_install.sh
index 89c3013d..2e60eafa 100644
--- a/boot/oof_install.sh
+++ b/boot/oof_install.sh
@@ -91,6 +91,10 @@ service docker restart
echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
resolvconf -u
+# Clone Gerrit repository
+cd /opt
+git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO optf-has
+
# Rename network interface in openstack Ubuntu 16.04 images. Then, reboot the VM to pick up changes
if [[ $CLOUD_ENV != "rackspace" ]]
then
@@ -103,7 +107,5 @@ then
reboot
fi
-# Clone Gerrit repository and run docker containers
-cd /opt
-git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO optf-has
+# Run docker containers
./oof_vm_init.sh \ No newline at end of file