adjusting the timeout while reading status.

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

diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index bc27481..1bb0084 100755 (executable)
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -33,7 +33,7 @@ check_status() {
     while [ $retval -eq 0 ]; do
         if juju status | grep -q $waitstatus; then
            echo -n '.'
-           if [ $timeoutiter -ge 240 ]; then
+           if [ $timeoutiter -ge 180 ]; then
                echo 'timed out'
                retval=1
            else
@@ -133,7 +133,7 @@ if [[ "$opnfvmodel" = "openstack" ]]; then
     #update source if trusty is target distribution
     var=os-$opnfvsdn-$fea-$opnfvtype"-"$opnfvdistro"_"$openstack
 
-    if ([ $osdomname ] && [ $osdomname != "null" ] && [ $osdomname != "None"]); then
+    if ([ $osdomname ] && [ $osdomname != "null" ] && [ $osdomname != "None" ]); then
         var=$var"_"publicapi
     fi
 else

diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
index eda8496..5dd544e 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
@@ -6,9 +6,7 @@
       bindings:
         "": internal-api
 {% if opnfv.spaces_dict.storage is defined %}
-        public: storage-cluster
-{% else %}
-        public: internal-api
+        cluster: storage-cluster
 {% endif %}
 {% endif %}
       options:
@@ -54,11 +52,7 @@
       bindings:
         "": internal-api
 {% if opnfv.spaces_dict.storage is defined %}
-        public: storage-cluster
         cluster: storage-cluster
-{% else %}
-        public: internal-api
-        cluster: internal-api
 {% endif %}
 {% endif %}
       options:
@@ -111,9 +105,6 @@
 {% else %}
         public: internal-api
 {% endif %}
-{% if opnfv.spaces_dict.storage is defined %}
-        mon: storage-cluster
-{% endif %}
 {% endif %}
       options:
         region: {{ os.region }}

diff --git a/ci/deploy.sh b/ci/deploy.sh
index bc14630..768f5e8 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -188,7 +188,7 @@ check_status() {
     while [ $retval -eq 0 ]; do
         if juju status | grep -q $waitstatus; then
            echo -n '.'
-           if [ $timeoutiter -ge 120 ]; then
+           if [ $timeoutiter -ge 180 ]; then
                echo 'timed out'
                retval=1
            else