diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-02-08 17:44:20 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-02-08 17:44:20 -0500 |
| commit | decf6fd40994946ff39d8d50910d8e146e87b894 (patch) | |
| tree | 3069b72b206562a504ee1f3283f9573c646866e6 | |
| parent | a78118c5760c8653fe074342202dca8ac4ddf8dd (diff) | |
Apex: adds host route for csit jobs
This route will let functest container access floating IPs on the
overcloud when virtual deployments are used.
Change-Id: I9c63239d4d224a141538e9d6f203f4902fe8752e
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rwxr-xr-x | jjb/apex/apex-deploy.sh | 10 | ||||
| -rw-r--r-- | jjb/apex/apex-snapshot-create.sh | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index 9535e7fb7..a27c92d29 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -203,6 +203,16 @@ fi # start deployment sudo ${DEPLOY_CMD} -d ${DEPLOY_FILE} -n ${NETWORK_FILE} --debug +if [[ "$JOB_NAME" == *csit* ]]; then + echo "CSIT job: setting host route for floating ip routing" + # csit route to allow docker container to reach floating ips + UNDERCLOUD=$(sudo virsh domifaddr undercloud | grep -Eo "[0-9\.]+{3}[0-9]+") + if route | grep 192.168.37.128; then + sudo route del -net 192.168.37.128 netmask 255.255.255.128 + fi + sudo route add -net 192.168.37.128 netmask 255.255.255.128 gw ${UNDERCLOUD} +fi + echo echo "--------------------------------------------------------" echo "Done!" diff --git a/jjb/apex/apex-snapshot-create.sh b/jjb/apex/apex-snapshot-create.sh index 5725ac641..4647e0670 100644 --- a/jjb/apex/apex-snapshot-create.sh +++ b/jjb/apex/apex-snapshot-create.sh @@ -35,7 +35,7 @@ popd > /dev/null echo "Gathering introspection information" git clone https://gerrit.opnfv.org/gerrit/sdnvpn.git pushd sdnvpn/odl-pipeline/lib > /dev/null -./tripleo_introspector.sh --out-file ${tmp_dir}/node.yaml +sudo ./tripleo_introspector.sh --out-file ${tmp_dir}/node.yaml popd > /dev/null echo "Shutting down nodes" |