CSIT: fixes for functest

Since we have no 'installer' for CSIT snapshot deployments, we need to
indicate to functest where the RC credentials are.  This patch adds
that, as well as modifying the IP configured for the host br-external
bridge to be the GW IP for the external neutron network.  This will
allow floating IPs to work with the Functest container.

Change-Id: Ie594de8cb2d7837abfad612b9ba49b0c02e7b2be
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml
index 7a99984..8853e30 100644 (file)
--- a/jjb/3rd_party_ci/odl-netvirt.yml
+++ b/jjb/3rd_party_ci/odl-netvirt.yml
@@ -129,6 +129,7 @@
                   predefined-parameters: |
                     DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
                     FUNCTEST_SUITE_NAME=healthcheck
+                    RC_FILE_PATH='~/cloner-info/overcloudrc'
                   node-parameters: true
                   kill-phase-on: FAILURE
                   abort-all-job: false

diff --git a/jjb/apex/apex-snapshot-deploy.sh b/jjb/apex/apex-snapshot-deploy.sh
index 773edd2..05a2d48 100644 (file)
--- a/jjb/apex/apex-snapshot-deploy.sh
+++ b/jjb/apex/apex-snapshot-deploy.sh
@@ -96,8 +96,8 @@ for network_def in ${virsh_networks}; do
       sudo ip addr add  192.0.2.99/24 dev br-admin
       sudo ip link set up dev br-admin
     elif [ "br-${network}" == 'br-external' ]; then
-      echo "Configuring IP 192.168.37.99 on br-external"
-      sudo ip addr add  192.168.37.99/24 dev br-external
+      echo "Configuring IP 192.168.37.1 on br-external"
+      sudo ip addr add  192.168.37.1/24 dev br-external
       sudo ip link set up dev br-external
     fi
   fi