From: Yolanda Robla Mota Date: Fri, 21 Oct 2016 04:59:51 +0000 (+0200) Subject: Fix automated job to properly create the bridge X-Git-Tag: danube.1.0~684 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e953cd85b6f80cf2320e62113d95cab16296c959;p=releng.git 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 --- 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