delete pod if exist during maas deployment.

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

diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index e741cd8..788454c 100755 (executable)
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -384,7 +384,8 @@ addnodes(){
     do
         maas $PROFILE machine delete $m
     done
-    maas $PROFILE pod delete 1 || true
+    podno=$(maas $PROFILE pods read | jq -r ".[]".id)
+    maas $PROFILE pod delete $podno || true
 
     # if we have a virshurl configuration we use it, else we use local
     VIRSHURL=$(cat labconfig.json | jq -r '.opnfv.virshurl')

diff --git a/ci/config_tpl/juju2/bundle_tpl/odl.yaml b/ci/config_tpl/juju2/bundle_tpl/odl.yaml
index 0e3e1d8..2b12e6f 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/odl.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/odl.yaml
@@ -5,7 +5,7 @@
       bindings:
         "": *oam-space
         controller-api: *internal-space
-        ovsdb-manager-api: *internal-space
+        ovsdb-manager: *internal-space
 {% endif %}
       options:
         install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.0-Carbon/distribution-karaf-0.6.0-Carbon.tar.gz"

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 3985896..2792759 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -210,7 +210,8 @@ deploy() {
         do
             maas $PROFILE machine delete $m || true
         done
-        maas $PROFILE pod delete 1 || true
+        podno=$(maas $PROFILE pods read | jq -r ".[]".id)
+        maas $PROFILE pod delete $podno || true
 
         ./cleanvm.sh || true