X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fdeploy.sh;fp=ci%2Fdeploy.sh;h=560807f74d356e4ae37d831332885eeb4c591893;hb=cad8852bf819f51f2e9602b11d4fc8b723623006;hp=a6a1b182b75634a02b72fb0762885809244700ba;hpb=0b6cf885239f5612c19db205d9a827572ad73c8a;p=joid.git

diff --git a/ci/deploy.sh b/ci/deploy.sh
index a6a1b182..560807f7 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -227,7 +227,7 @@ deploy() {
         ./cleanvm.sh || true
 
         if [ "$virtinstall" -eq 1 ]; then
-            ./00-maasdeploy.sh virtual
+            ./03-maasdeploy.sh virtual
         else
             if [ -z "$labfile" ]; then
                 if [ ! -e ./labconfig.yaml ]; then
@@ -248,7 +248,7 @@ deploy() {
                 cp $labfile ./labconfig.yaml
             fi
 
-            ./00-maasdeploy.sh custom
+            ./03-maasdeploy.sh custom
         fi
     fi
 
@@ -318,8 +318,6 @@ juju status --format=tabular
 # translate bundle.yaml to json
 python -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, indent=4)' < bundles.yaml > bundles.json
 
-jujuver=`juju --version`
-
 # Configuring deployment
 if ([ $opnfvmodel == "openstack" ]); then
     echo_info "Configuring OpenStack deployment"
@@ -327,13 +325,8 @@ if ([ $opnfvmodel == "openstack" ]); then
     ./openstack.sh "$opnfvsdn" "$opnfvlab" "$opnfvdistro" "$openstack" || true
 
     # creating heat domain after pushing the public API into /etc/hosts
-    if [[ "$jujuver" > "2" ]]; then
-        status=`juju run-action heat/0 domain-setup`
-        echo $status
-    else
-        status=`juju action do heat/0 domain-setup`
-        echo $status
-    fi
+    status=`juju run-action heat/0 domain-setup`
+    echo $status
 
     sudo ../juju/get-cloud-images || true
     ../juju/joid-configure-openstack || true