Change-Id: Ia57f9bd4d76efbeb2dee35fc41e90001698c39ec
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
#check whether charms are still executing the code even juju-deployer says installed.
check_status() {
waitstatus=$1
#check whether charms are still executing the code even juju-deployer says installed.
check_status() {
waitstatus=$1
while [ $retval -eq 0 ]; do
if juju status | grep -q $waitstatus; then
echo -n '.'
while [ $retval -eq 0 ]; do
if juju status | grep -q $waitstatus; then
echo -n '.'
- if [ $timeoutiter -ge 180 ]; then
+ if [ $timeoutiter -ge $waittime ]; then
echo 'timed out'
retval=1
else
echo 'timed out'
retval=1
else
# with JUJU 2.0 bundles has to be deployed only once.
juju deploy bundles.yaml --debug
# with JUJU 2.0 bundles has to be deployed only once.
juju deploy bundles.yaml --debug
-sleep 120
-check_status allocating
+sleep 720
+check_status allocating 220
# need to revisit later if not needed we will remove the below.
openfile_fix() {
# need to revisit later if not needed we will remove the below.
openfile_fix() {
#check whether charms are still executing the code even juju-deployer says installed.
check_status() {
waitstatus=$1
#check whether charms are still executing the code even juju-deployer says installed.
check_status() {
waitstatus=$1
while [ $retval -eq 0 ]; do
if juju status | grep -q $waitstatus; then
echo_info "Still waiting for $waitstatus units"
while [ $retval -eq 0 ]; do
if juju status | grep -q $waitstatus; then
echo_info "Still waiting for $waitstatus units"
- if [ $timeoutiter -ge 180 ]; then
+ if [ $timeoutiter -ge $waittime ]; then
echo_error 'Timed out'
retval=1
else
echo_error 'Timed out'
retval=1
else
echo_info "Deployment started"
deploy
echo_info "Deployment started"
deploy
+check_status executing 180
echo_info "Deployment finished"
juju status --format=tabular
echo_info "Deployment finished"
juju status --format=tabular
elif ([ $opnfvmodel == "kubernetes" ]); then
#Workarounf for master chanrm as it takes 5 minutes to run properly
elif ([ $opnfvmodel == "kubernetes" ]); then
#Workarounf for master chanrm as it takes 5 minutes to run properly
- check_status waiting
- check_status executing
+ check_status waiting 50
+ check_status executing 50
echo_info "Configuring Kubernetes deployment"
./k8.sh
echo_info "Configuring Kubernetes deployment"
./k8.sh