From: Anthony PERARD <anthony.perard@citrix.com>
Date: Thu, 5 May 2016 10:41:27 +0000 (+0000)
Subject: jenkins-job: Use vif-bridge-nova-network if available
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9f0f63ed874082f2787dbf717f1b9d62850461f4;p=openstack%2Fci-loop-config.git

jenkins-job: Use vif-bridge-nova-network if available
---

diff --git a/jenkins/jobs/jobs.yaml b/jenkins/jobs/jobs.yaml
index 5f674cb..326993e 100644
--- a/jenkins/jobs/jobs.yaml
+++ b/jenkins/jobs/jobs.yaml
@@ -21,6 +21,18 @@
               # not replaced devstack
               sudo dpkg -i /opt/nodepool-scripts/*.deb
               sudo apt-get install -y -f --fix-missing
+              # Testing extra conf if possible
+              if [[ -e $BASE/new/nova/contrib/xen/vif-bridge-nova-network ]]; then
+                echo "Will use vif-bridge-nova-network from nova.git/contrib/xen/ as vif-bridge"
+                sudo cp -v $BASE/new/nova/contrib/xen/vif-bridge-nova-network /etc/xen/scripts/
+                echo "Updating /etc/nova/nova.conf with xen_vif_bridge_script_path = vif-bridge-nova-network"
+                cat <<EOF >> $BASE/new/devstack/local.conf
+          [[post-config|\$NOVA_CONF]]
+          [libvirt]
+          xen_vif_bridge_script_path = vif-bridge-nova-network
+          EOF
+                cat $BASE/new/devstack/local.conf
+              fi
           }}
 
           function cleanup_host_hook {{