From: Anthony PERARD <anthony.perard@citrix.com>
Date: Wed, 2 Nov 2016 12:25:13 +0000 (+0000)
Subject: image: Add workaround in vif-bridge
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=74410d173850178bf71507b71344b6bd2d2896ea;p=openstack%2Fci-loop-config.git

image: Add workaround in vif-bridge
---

diff --git a/nodepool/scripts/prepare_node_devstack_xen.sh b/nodepool/scripts/prepare_node_devstack_xen.sh
index f03e1ab..cea29fa 100755
--- a/nodepool/scripts/prepare_node_devstack_xen.sh
+++ b/nodepool/scripts/prepare_node_devstack_xen.sh
@@ -40,6 +40,9 @@ EOC
 
 sudo update-grub
 
+# Workaround https://bugs.launchpad.net/nova/+bug/1461642
+sed -r -i 's/^( *)(handle_iptable)/\1: #\2/' /etc/xen/scripts/vif-bridge
+
 # Disable cloud-init - it doesn't work in dom0 Xen
 for i in /etc/init/cloud-*; do echo manual | sudo tee ${i%.conf}.override; done