diff options
| -rw-r--r-- | jjb/apex/apex-snapshot-deploy.sh | 7 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml | 1 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/jjb/apex/apex-snapshot-deploy.sh b/jjb/apex/apex-snapshot-deploy.sh index a93421c8e..0665ce09d 100644 --- a/jjb/apex/apex-snapshot-deploy.sh +++ b/jjb/apex/apex-snapshot-deploy.sh @@ -147,8 +147,9 @@ netvirt_url="http://${admin_controller_ip}:8081/restconf/operational/network-top source overcloudrc counter=1 while [ "$counter" -le 10 ]; do - if curl --fail --silent ${admin_controller_ip}:80 > /dev/null; then - echo "Overcloud Horizon is up...Checking if OpenDaylight NetVirt is up..." + echo "Checking if OpenStack is up" + if nc -z ${admin_controller_ip} 9696 > /dev/null; then + echo "Overcloud Neutron is up...Checking if OpenDaylight NetVirt is up..." if curl --fail --silent -u admin:admin ${netvirt_url} > /dev/null; then echo "OpenDaylight is up. Overcloud deployment complete" exit 0 @@ -156,7 +157,7 @@ while [ "$counter" -le 10 ]; do echo "OpenDaylight not yet up, try ${counter}" fi else - echo "Horizon/Apache not yet up, try ${counter}" + echo "Neutron not yet up, try ${counter}" fi counter=$((counter+1)) sleep 60 diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 8dcd4d431..e24a2c358 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -402,7 +402,6 @@ - 'apex-run.*' - 'apex-virtual-.*' - 'apex-verify-gate-.*' - - 'apex-.*-promote.*' - 'odl-netvirt.*' - throttle: max-per-node: 1 diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 377d38d40..1f5232b5f 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -274,7 +274,6 @@ - 'apex-run.*' - 'apex-virtual-.*' - 'apex-verify-gate-.*' - - 'apex-.*-promote.*' - 'odl-netvirt.*' - throttle: max-per-node: 1 |