From d2d6923d759fbed5ad5147c95f9cb9f9051c8b11 Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Fri, 7 Oct 2016 23:42:57 -0500
Subject: [PATCH] remove phase bundle to single bundle and test.

Change-Id: I2d04ea10f34d0bd578a635c63f27aae361293e18
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---
 ci/02-deploybundle.sh                |  3 +--
 ci/config_tpl/bundle_tpl/bundle.yaml | 15 +--------------
 ci/deploy.sh                         |  2 +-
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index 9676d8d1..73795ae4 100755
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -108,7 +108,7 @@ python genBundle.py  -l deployconfig.yaml  -s $var > bundles.yaml
 pastebinit bundles.yaml || true
 
 echo "... Deployment Started ...."
-juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $opnfvdistro-"$openstack"-nodes
+juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $opnfvdistro-"$openstack"
 
 # seeing issue related to number of open files.
 # juju run --service nodes 'echo 2048 | sudo tee /proc/sys/fs/inotify/max_user_instances'
@@ -124,4 +124,3 @@ while [ $c -lt $count ]; do
     let c+=1
 done
 
-juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $opnfvdistro-"$openstack" || true
diff --git a/ci/config_tpl/bundle_tpl/bundle.yaml b/ci/config_tpl/bundle_tpl/bundle.yaml
index 02733da3..9e171b8f 100644
--- a/ci/config_tpl/bundle_tpl/bundle.yaml
+++ b/ci/config_tpl/bundle_tpl/bundle.yaml
@@ -1,13 +1,5 @@
 # vim: set ts=2 et:
-{{ ubuntu.release }}-{{ os.release }}-nodes:
-  inherits: openstack-phase1
-  #overrides:
-{% include 'phase2-overrides.yaml' %}
-
 {{ ubuntu.release }}-{{ os.release }}:
-  inherits: openstack-phase2
-
-openstack-phase1:
   services:
 {% if os.hyperconverged %}
     nodes:
@@ -69,6 +61,7 @@ openstack-phase1:
 {% if os.ha.mode == 'ha' %}
 {% include 'haclusters.yaml' %}
 {% endif %}
+{% include 'subordinate.yaml' %}
 
 {% if os.hyperconverged %}
   relations:
@@ -81,10 +74,4 @@ openstack-phase1:
 {% if os.ha.mode == 'ha' %}
 {% include 'harelations.yaml' %}
 {% endif %}
-
-openstack-phase2:
-  inherits: openstack-phase1
-  relations:
 {% include 'relations.yaml' %}
-  services:
-{% include 'subordinate.yaml' %}
diff --git a/ci/deploy.sh b/ci/deploy.sh
index c455727c..48c0d6e6 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -150,7 +150,7 @@ check_status() {
        juju status > status.txt
        if [ "$(grep -c "executing" status.txt )" -ge 1 ]; then
            echo " still executing the reltionship within charms ..."
-           if [ $timeoutiter -ge 60 ]; then
+           if [ $timeoutiter -ge 90 ]; then
                retval=1
            fi
            timeoutiter=$((timeoutiter+1))
-- 
2.16.6