summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYolanda Robla Mota <yroblamo@redhat.com>2016-10-21 06:59:51 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-11-02 08:43:49 +0000
commite953cd85b6f80cf2320e62113d95cab16296c959 (patch)
tree78793b238f16aa93f05ccd564ad0b150ab13b917
parent5e784f05f291a1874d693cc792f77a9029411ab0 (diff)
Fix automated job to properly create the bridge
The element that creates the bridge was moved from file to template. But in the case of VMs we are not running puppet to install bifrost, so that is not applied. Manually place the file in the right path, and replace the bridge name with the expected br_opnfv. Change-Id: I22b2213b529343b24c358b3c80fd1849ec40979c Signed-Off-By: Yolanda Robla <yroblamo@redhat.com>
-rwxr-xr-xjjb/infra/bifrost-verify.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/jjb/infra/bifrost-verify.sh b/jjb/infra/bifrost-verify.sh
index f7920a36f..a782904be 100755
--- a/jjb/infra/bifrost-verify.sh
+++ b/jjb/infra/bifrost-verify.sh
@@ -46,6 +46,13 @@ sudo git fetch $PROJECT_REPO $GERRIT_REFSPEC && sudo git checkout FETCH_HEAD
# combine opnfv and upstream scripts/playbooks
sudo /bin/cp -rf /opt/releng/prototypes/bifrost/* /opt/bifrost/
+# place bridge creation file on the right path
+mkdir -p /opt/puppet-infracloud/files/elements/infra-cloud-bridge/static/opt
+cp /opt/puppet-infracloud/templates/bifrost/create_bridge.py.erb /opt/puppet-infracloud/files/elements/infra-cloud-bridge/static/opt/create_bridge.py
+
+# replace bridge name
+sed -i .bak s/<%= @bridge_name -%>/br_opnfv/g /opt/puppet-infracloud/files/elements/infra-cloud-bridge/static/opt/create_bridge.py
+
# cleanup remnants of previous deployment
cd /opt/bifrost
sudo -E ./scripts/destroy-env.sh