diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-02-13 11:48:47 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-02-13 11:48:47 -0500 |
| commit | 6fdb42e818a34467410eef478acb9340926c6194 (patch) | |
| tree | 00f2f41db2b04b91a2e2879551ab03c0007ceef8 | |
| parent | 9eae169018b1a04a50fc09e1d47e750876687cf6 (diff) | |
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>
| -rw-r--r-- | jjb/3rd_party_ci/odl-netvirt.yml | 1 | ||||
| -rw-r--r-- | jjb/apex/apex-snapshot-deploy.sh | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml index 7a9998433..8853e3056 100644 --- 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 773edd228..05a2d4820 100644 --- 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 |