Merge "Fix yamllint for yang-push"

[releng/builder.git] / jjb / netvirt / netvirt-csit-hwvtep-openstack.yaml

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 59eeb84fe69d5fc11115c4640cfbe080f120b1cf..1a361147a250baf9b47de19a1a8e75b5666bfcdf 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -17,7 +17,7 @@
             enable-haproxy: 'yes'
             install-features: 'odl-jolokia,odl-netvirt-openstack'
 
-    testplan: '{project}-{topology}-openstack.txt'
+    testplan: '{project}-{topology}-l2gw-openstack.txt'
 
     functionality:
         - upstream-transparent:
@@ -60,17 +60,17 @@
             openstack-branch: 'stable/mitaka'
             odl-ml2-branch: 'stable/mitaka'
             odl-ml2-driver-version: 'v1'
-            openstack_system_image: 'CentOS 7 - devstack - mitaka - 20170106-2237'
+            openstack_system_image: 'CentOS 7 - devstack-mitaka - 20170210-1356'
         - newton:
             openstack-branch: 'stable/newton'
             odl-ml2-branch: 'stable/newton'
             odl-ml2-driver-version: 'v1'
-            openstack_system_image: 'CentOS 7 - devstack - newton - 20170106-2237'
+            openstack_system_image: 'CentOS 7 - devstack-newton - 20170210-1344'
         - newton-nodl-v2:
             openstack-branch: 'stable/newton'
             odl-ml2-branch: 'stable/newton'
             odl-ml2-driver-version: 'v2'
-            openstack_system_image: 'CentOS 7 - devstack - newton - 20170106-2237'
+            openstack_system_image: 'CentOS 7 - devstack-newton - 20170210-1344'
 
     tools_system_count: 2
 
@@ -78,11 +78,15 @@
 
     odl-enable-l3: 'yes'
 
+    enable-networking-l2gw: 'yes'
+
+    disable-odl-l3-service-plugin: 'yes'
+
     public-bridge: 'br-physnet1'
 
     public-physical-network: 'physnet1'
 
-    enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
+    enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest,l2gw-plugin'
 
     disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'