From 7ae91a059f2b498ebacc66440f5de21eea99033c Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Mon, 17 Oct 2016 00:08:32 -0500
Subject: more changes needed  for juju 2.0

Change-Id: I30a1703bdd0dbfc72d0a35c2bee39a1f1b57b52a
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---
 ci/deploy.sh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'ci/deploy.sh')

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 15f6e476..66a9e8f8 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -14,6 +14,8 @@ opnfvfeature=none
 opnfvdistro=xenial
 opnfvarch=amd64
 
+jujuver=`juju --version`
+
 read_config() {
     opnfvrel=`grep release: deploy.yaml | cut -d ":" -f2`
     openstack=`grep openstack: deploy.yaml | cut -d ":" -f2`
@@ -176,8 +178,15 @@ 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
+
+if [ "$jujuver" > "2" ]; then
+    status=`juju run-action do heat/0 domain-setup`
+    echo $status
+else
+    status=`juju action do heat/0 domain-setup`
+    echo $status
+fi
+
 
 sudo ../juju/get-cloud-images || true
 ../juju/joid-configure-openstack || true
-- 
cgit 1.2.3-korg