From 85e65d41f1cdc9c9291fb5b2de29c02f0e57b405 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Thu, 10 Dec 2015 15:02:15 -0600 Subject: [PATCH] modified the yaml on request from David from Orange so that devices option can be modified to format the osd device. modified deploy.sh so that return value is positive. Change-Id: Idc94f4a99889df88bfae6446ce212050a570d30a --- ci/deploy.sh | 18 ++++++++++++++---- ci/nosdn/juju-deployer/ovs-ha.yaml | 2 +- ci/nosdn/juju-deployer/ovs-tip.yaml | 2 +- ci/nosdn/juju-deployer/ovs.yaml | 2 +- ci/odl/juju-deployer/ovs-odl-ha.yaml | 2 +- ci/odl/juju-deployer/ovs-odl-tip.yaml | 2 +- ci/odl/juju-deployer/ovs-odl.yaml | 2 +- ci/opencontrail/juju-deployer/contrail-ha.yaml | 2 +- ci/opencontrail/juju-deployer/contrail-tip.yaml | 2 +- ci/opencontrail/juju-deployer/contrail.yaml | 2 +- 10 files changed, 23 insertions(+), 13 deletions(-) diff --git a/ci/deploy.sh b/ci/deploy.sh index 92d17e20..12806253 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -77,10 +77,20 @@ deploy() { } check_status() { - while [ $? -eq 0 ]; do - sleep 60 - echo " still executing the reltionship within charms ..." - juju status | grep executing > /dev/null + retval=0 + timeoutiter=0 + while [ $retval -eq 0 ]; do + sleep 30 + 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 + retval=1 + fi + timeoutiter=$((timeoutiter+1)) + else + retval=1 + fi done echo "...... deployment finishing ......." } diff --git a/ci/nosdn/juju-deployer/ovs-ha.yaml b/ci/nosdn/juju-deployer/ovs-ha.yaml index f315876a..d814965f 100644 --- a/ci/nosdn/juju-deployer/ovs-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-ha.yaml @@ -92,7 +92,7 @@ openstack-phase2: monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== osd-devices: /srv monitor-count: 1 -# osd-reformat: 'yes' + osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: diff --git a/ci/nosdn/juju-deployer/ovs-tip.yaml b/ci/nosdn/juju-deployer/ovs-tip.yaml index d944b854..66d66d5e 100644 --- a/ci/nosdn/juju-deployer/ovs-tip.yaml +++ b/ci/nosdn/juju-deployer/ovs-tip.yaml @@ -52,7 +52,7 @@ openstack-phase2: monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== osd-devices: /srv monitor-count: 1 -# osd-reformat: 'yes' + osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: diff --git a/ci/nosdn/juju-deployer/ovs.yaml b/ci/nosdn/juju-deployer/ovs.yaml index 62d43bc0..01f3704b 100644 --- a/ci/nosdn/juju-deployer/ovs.yaml +++ b/ci/nosdn/juju-deployer/ovs.yaml @@ -52,7 +52,7 @@ openstack-phase2: monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== osd-devices: /srv monitor-count: 1 -# osd-reformat: 'yes' + osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index f973f0cb..4b02f708 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -92,7 +92,7 @@ openstack-phase2: monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== osd-devices: /srv monitor-count: 1 -# osd-reformat: 'yes' + osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index 3066ef3c..ee626214 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -52,7 +52,7 @@ openstack-phase2: monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== osd-devices: /srv monitor-count: 1 -# osd-reformat: 'yes' + osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml index 0ab46c76..e67929df 100644 --- a/ci/odl/juju-deployer/ovs-odl.yaml +++ b/ci/odl/juju-deployer/ovs-odl.yaml @@ -52,7 +52,7 @@ openstack-phase2: monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== osd-devices: /srv monitor-count: 1 -# osd-reformat: 'yes' + osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml index cbe6b660..686ba847 100644 --- a/ci/opencontrail/juju-deployer/contrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml @@ -109,7 +109,7 @@ openstack-phase2: monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== osd-devices: /srv monitor-count: 1 -# osd-reformat: 'yes' + osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: diff --git a/ci/opencontrail/juju-deployer/contrail-tip.yaml b/ci/opencontrail/juju-deployer/contrail-tip.yaml index a329dc6f..da32c8fa 100644 --- a/ci/opencontrail/juju-deployer/contrail-tip.yaml +++ b/ci/opencontrail/juju-deployer/contrail-tip.yaml @@ -63,7 +63,7 @@ openstack-phase2: monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== osd-devices: /srv monitor-count: 1 -# osd-reformat: 'yes' + osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: diff --git a/ci/opencontrail/juju-deployer/contrail.yaml b/ci/opencontrail/juju-deployer/contrail.yaml index c9770df7..ec58c058 100644 --- a/ci/opencontrail/juju-deployer/contrail.yaml +++ b/ci/opencontrail/juju-deployer/contrail.yaml @@ -63,7 +63,7 @@ openstack-phase2: monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== osd-devices: /srv monitor-count: 1 -# osd-reformat: 'yes' + osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: -- 2.16.6