From: Jamo Luhrsen <jluhrsen@redhat.com>
Date: Fri, 7 Apr 2017 19:21:40 +0000 (-0700)
Subject: Fix hypervisor count for all-in-one devstack
X-Git-Tag: release/carbon~162^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=fc09c0ffb1c0c5676c761362fa14b4a24badbc81;p=releng%2Fbuilder.git

Fix hypervisor count for all-in-one devstack

Change-Id: If1bf653c2a2981a5395e52660d83c19948781990
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
---

diff --git a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
index fd0d97e80..427bcbc99 100644
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -643,7 +643,7 @@ do
     # will be the same as the number of openstack systems. However, if we are doing multinode openstack then the
     # assumption is we have a single control node and the rest are compute nodes, so the number of expected hypervisors
     # is one less than the total number of openstack systems
-    if [ $((NUM_OPENSTACK_SYSTEM / NUM_OPENSTACK_SITES - 1)) -eq 1 ]; then
+    if [ $((NUM_OPENSTACK_SYSTEM / NUM_OPENSTACK_SITES)) -eq 1 ]; then
         expected_num_hypervisors=1
     else
         expected_num_hypervisors=${NUM_COMPUTES_PER_SITE}
diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 456f8b959..a9cc262db 100644
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -9,7 +9,6 @@
     # Timeout in minutes
     build-timeout: 360
     build-node: centos7-java-builder-2c-8g
-    num-openstack-sites: 1
 
     email-recipients: 'jenkins@lists.opendaylight.org'
     odl-ml2-driver-repo: 'https://github.com/openstack/networking-odl'
@@ -18,21 +17,24 @@
     devstack-lbaas-plugin-repo: 'https://github.com/openstack/neutron-lbaas'
     server-name: 'OpenDaylight'
     git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418'
-    ipsec-vxlan-tunnels-enabled: 'no'
 
-    public-bridge: 'br-physnet1'
-    public-physical-network: 'physnet1'
-    odl-enable-l3: 'yes'
-    odl-ml2-driver-version: 'v1'
-    odl-ml2-port-binding: 'network-topology'
-    enable-openstack-plugins: 'networking-odl'
-    enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
+    # defaults for parameters installing openstack for csit jobs
+    create-initial-networks: 'False'
+    disable-odl-l3-service-plugin: 'no'
     disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
     enable-networking-l2gw: 'no'
+    enable-openstack-plugins: 'networking-odl'
+    enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
+    ipsec-vxlan-tunnels-enabled: 'no'
     lbaas-service-provider: ''
-    create-initial-networks: 'False'
-    tenant-network-type: 'vxlan'
+    num-openstack-sites: 1
+    odl-enable-l3: 'yes'
+    odl-ml2-driver-version: 'v1'
+    odl-ml2-port-binding: 'network-topology'
+    public-bridge: 'br-physnet1'
+    public-physical-network: 'physnet1'
     security-group-mode: 'none'
+    tenant-network-type: 'vxlan'
 
     # openstack-infra-parameters defaults
     archive-artifacts: ''