Merge "Add a note regarding deploy maven jobs"

[releng/builder.git] / jjb / netvirt / netvirt-vpnservice-csit-3node-multi-openstack.yaml

diff --git a/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml
index 876f099939a2972e28da64124027ade623ce53cc..50fad15eeb256ad1a6032c3f715b8cd041454890 100644 (file)
--- a/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml
@@ -21,9 +21,9 @@
         - mitaka:
             openstack-branch: 'stable/mitaka'
             odl-ml2-version:  'stable/mitaka'
-        - liberty:
-            openstack-branch: 'stable/liberty'
-            odl-ml2-version:  'stable/liberty'
+        - newton:
+            openstack-branch: 'stable/newton'
+            odl-ml2-version:  'master'
 
     openstack-vms: 4
 
@@ -35,10 +35,12 @@
 
     enable-haproxy: 'yes'
 
-    public-bridge: 'br-ex'
+    public-bridge: 'public' # PUBLIC_PHYSICAL_NETWORK
 
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
 
     disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
 
     tenant-network-type: 'vxlan'
+
+    security-group-mode: 'transparent'