Make Openstack jobs more configurable

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

diff --git a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
index 1c7d2777dd4aaaba9f2e8cb676f3551729d47e50..14e5ddd9663cfea6aac02ef3993e4fc91350b58d 100644 (file)
--- a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
@@ -20,7 +20,7 @@
     openstack:
         - mitaka:
             openstack-branch: 'stable/mitaka'
-            odl-ml2-version:  'master'
+            odl-ml2-version:  'stable/mitaka'
         - liberty:
             openstack-branch: 'stable/liberty'
             odl-ml2-version:  'stable/liberty'
@@ -32,3 +32,9 @@
     schedule: 'H H * * *'
 
     odl-enable-l3: 'yes'
+
+    enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
+
+    disable-openstack-services: 'swift,cinder,n-net,q-vpn'
+
+    tenant-network-type: 'vxlan'