Update ansible playbooks VIRL setup

Change-Id: I704991c65dc5fc9ce40ade932cab104fa468696c
Signed-off-by: Matej Klotton <mklotton@cisco.com>

diff --git a/resources/tools/testbed-setup/playbooks/03-virl-post-install.yaml b/resources/tools/testbed-setup/playbooks/03-virl-post-install.yaml
index 59bcfe9..d8e2589 100644 (file)
--- a/resources/tools/testbed-setup/playbooks/03-virl-post-install.yaml
+++ b/resources/tools/testbed-setup/playbooks/03-virl-post-install.yaml
@@ -17,10 +17,18 @@
     shell: ln -s /nfs/scratch /scratch
     args:
       creates: /scratch
-  - name: upate Nova CPU mode
+  - name: Patch nova scripts
+    patch:
+      src: ./files/nova_os_ip.patch
+      basedir: /usr/lib/python2.7/dist-packages/nova
+  - name: Upate Nova CPU mode
     ini_file: dest=/etc/nova/nova.conf section=libvirt option=cpu_mode value=host-passthrough
   - name: Restart nova-compute service
     service: name=nova-compute state=restarted
+  - name: Upate Neutron bridge ageing time
+    ini_file: dest=/etc/neutron/neutron.conf section=DEFAULT option=network_bridge_ageing value=0
+  - name: Restart neutron-linuxbridge-agent service
+    service: name=neutron-linuxbridge-agent state=restarted
   - name: Permit SSH user environment
     lineinfile: dest=/etc/ssh/sshd_config state=present regexp='PermitUserEnvironment.*' line='PermitUserEnvironment yes'
   - name: Restart SSH daemon

diff --git a/resources/tools/testbed-setup/playbooks/files/nova_os_ip.patch b/resources/tools/testbed-setup/playbooks/files/nova_os_ip.patch
new file mode 100644 (file)
index 0000000..a943dc9
--- /dev/null
+++ b/resources/tools/testbed-setup/playbooks/files/nova_os_ip.patch
@@ -0,0 +1,12 @@
+--- api/metadata/base.py.old   2017-04-26 12:38:52.522991596 +0000
++++ api/metadata/base.py       2017-04-26 10:06:46.396450566 +0000
+@@ -493,7 +493,7 @@
+                 path = 'openstack/%s/%s' % (version, VD_JSON_NAME)
+                 yield (path, self.lookup(path))
+
+-            if self._check_version(LIBERTY, version, ALL_OPENSTACK_VERSIONS):
++            if False and self._check_version(LIBERTY, version, ALL_OPENSTACK_VERSIONS):
+                 path = 'openstack/%s/%s' % (version, NW_JSON_NAME)
+                 yield (path, self.lookup(path))
+ 
+