Merge "Update packer excludes section"

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

diff --git a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
index 92f393df99517e1db793b7286d767e2489e2667d..b00958e85c1a625d335fd0581d9a35969cc05b9a 100644 (file)
--- a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
@@ -10,9 +10,12 @@
     functionality: 'openstack'
 
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
@@ -27,7 +30,7 @@
 
     openstack-vms: 4
 
-    install-features: 'odl-ovsdb-openstack'
+    install-features: 'odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     schedule: 'H H * * *'
 
@@ -35,8 +38,12 @@
 
     enable-haproxy: 'yes'
 
+    public-bridge: 'br-ex'
+
     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: 'none'
\ No newline at end of file