From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Thu, 15 Sep 2016 16:26:04 +0000 (-0500)
Subject: move the heat domain creation after openstack.sh
X-Git-Tag: danube.1.0~171
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f375a92d83e9a6d589ff1961e994004afc5d497e;p=joid.git

move the heat domain creation after openstack.sh

Change-Id: I93c5d7faebca8c61fffca6cc796e44659df805d9
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 3b5e5002..c455727c 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -158,8 +158,7 @@ check_status() {
            retval=1
        fi
     done
-    status=`juju action do heat/0 domain-setup`
-    echo $status
+
     juju expose ceph-radosgw
     #juju ssh ceph/0 \ 'sudo radosgw-admin user create --uid="ubuntu" --display-name="Ubuntu Ceph"'
 
@@ -174,6 +173,11 @@ check_status
 echo "...... deployment finished  ......."
 
 ./openstack.sh "$opnfvsdn" "$opnfvlab" "$opnfvdistro" "$openstack" || true
+
+# creating heat domain after puching the public API into /etc/hosts
+status=`juju action do heat/0 domain-setup`
+echo $status
+
 sudo ../juju/get-cloud-images || true
 ../juju/joid-configure-openstack || true