Refactor netvirt job params to use default values

[releng/builder.git] / jjb / groupbasedpolicy / groupbasedpolicy-csit-1node-openstack.yaml

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
index 7a3c9a6e1ed15d7bd3708c490f3ad8bc16fe8438..7c7913813501d559dcd41ee59da1f8d0c3bbaa66 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -36,30 +36,14 @@
       - mitaka:
           openstack-branch: 'stable/mitaka'
           odl-ml2-branch: 'stable/mitaka'
-          odl-ml2-driver-version: 'v1'
       - liberty:
           openstack-branch: 'stable/liberty'
           odl-ml2-branch: 'stable/liberty'
-          odl-ml2-driver-version: 'v1'
 
     schedule: 'H H * * *'
 
-    odl-enable-l3: 'yes'
-
     public-bridge: 'br-int'
 
-    public-physical-network: 'physnet1'
-
-    enable-networking-l2gw: 'no'
-
-    disable-odl-l3-service-plugin: 'no'
-
-    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'
+    enable-openstack-plugins: 'networking-odl'
 
     security-group-mode: 'none'
-
-    robot-options: ''