X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-multi-openstack.yaml;h=2ec08126c828c3c31371eaec53bc891188037102;hb=845ddf2f9e3694cc4b4202186de6274c1e4c836a;hp=76c36daae5813c34315b1b062a025aff15e1f270;hpb=0c768872e5b0a44b7b43cf85090816ba4cbcbd21;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 76c36daae..2ec08126c 100644
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -67,13 +67,6 @@
           odl-snat-mode: 'conntrack'
 
     openstack:
-      - pike:
-          openstack-branch: 'stable/pike'
-          odl-ml2-branch: 'stable/pike'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_pike}'
-          openstack_system2_image: '{openstack_system_image_pike}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - queens:
           openstack-branch: 'stable/queens'
           odl-ml2-branch: 'stable/queens'
@@ -149,13 +142,6 @@
           odl-snat-mode: 'conntrack'
 
     openstack:
-      - pike:
-          openstack-branch: 'stable/pike'
-          odl-ml2-branch: 'stable/pike'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_pike}'
-          openstack_system2_image: '{openstack_system_image_pike}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - queens:
           openstack-branch: 'stable/queens'
           odl-ml2-branch: 'stable/queens'
@@ -231,13 +217,6 @@
           odl-snat-mode: 'conntrack'
 
     openstack:
-      - pike:
-          openstack-branch: 'stable/pike'
-          odl-ml2-branch: 'stable/pike'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_pike}'
-          openstack_system2_image: '{openstack_system_image_pike}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - queens:
           openstack-branch: 'stable/queens'
           odl-ml2-branch: 'stable/queens'
@@ -256,11 +235,11 @@
     openstack_system2_flavor: odl-highcpu-8
     os-cmb-cnt: 0
     os-ctl-cnt: 1
-    os-cmp-cnt: 1
+    os-cmp-cnt: 2
 
     topology:
       - 1node:
-          openstack_system2_count: 1
+          openstack_system2_count: 2
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-sfc'
@@ -282,6 +261,8 @@
       - oxygen:
           branch: 'stable/oxygen'
           ovs-install: 'v2.6.1-nsh'
+          os-cmp-cnt: 1
+          openstack_system2_count: 1
 
     openstack:
       - queens:
@@ -363,13 +344,6 @@
           odl-snat-mode: 'conntrack'
 
     openstack:
-      - pike:
-          openstack-branch: 'stable/pike'
-          odl-ml2-branch: 'stable/pike'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_pike}'
-          openstack_system2_image: '{openstack_system_image_pike}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - queens:
           openstack-branch: 'stable/queens'
           odl-ml2-branch: 'stable/queens'