Merge "Fix hypervisor count for all-in-one devstack"

diff --cc jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
Simple merge

diff --cc jjb/releng-defaults.yaml
index cc2b73f7a94e3e3a88f30b138a7f8d761beea07d,a9cc262db39e4e16bbffe9461d407cfc060b7754..aa68b8e446e73b4e0bb1d31fd8bf7583b0711cba
--- 1/jjb/releng-defaults.yaml
--- 2/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@@ -16,24 -15,26 +15,27 @@@
      networking-l2gw-repo: 'http://git.openstack.org/openstack/networking-l2gw'
      devstack-kubernetes-plugin-repo: 'https://github.com/openstack/kuryr-kubernetes'
      devstack-lbaas-plugin-repo: 'https://github.com/openstack/neutron-lbaas'
 +    devstack-networking-sfc-plugin-repo: 'https://github.com/openstack/networking-sfc'
      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: ''