From: Marco Platania <platania@research.att.com>
Date: Wed, 25 Apr 2018 22:12:02 +0000 (-0400)
Subject: Fix order of operations in OOF init
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=b707dfad39f827945d9614a71150bf8f9e8f81e5;p=demo.git

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>
---

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