Add parameters for choosing vxlan or gre

deploy-baremetal-overcloudrc

@@ -13,6 +13,8 @@ export NETWORK_CIDR="10.0.0.0/8"
 export FLOATING_IP_START="172.17.0.45"
 export FLOATING_IP_END="172.17.0.64"
 export FLOATING_IP_CIDR="172.17.0.0/16"
+export NEUTRON_NETWORK_TYPE=gre
+export NETURON_TUNNEL_TYPES=gre
 export COMPUTESCALE=1
 export BLOCKSTORAGESCALE=1
 export SWIFTSTORAGESCALE=1

deploy-virt-overcloudrc

@@ -9,6 +9,8 @@ export NETWORK_CIDR=10.0.0.0/8
 export FLOATING_IP_START=192.0.2.45
 export FLOATING_IP_END=192.0.2.64
 export FLOATING_IP_CIDR=192.0.2.0/24
+export NEUTRON_NETWORK_TYPE=gre
+export NETURON_TUNNEL_TYPES=gre
 export MACS=""
 export COMPUTESCALE=1
 export BLOCKSTORAGESCALE=1

scripts/instack-deploy-overcloud

@@ -131,6 +131,8 @@ else
     -P NovaPassword=${OVERCLOUD_NOVA_PASSWORD} \
     -P SwiftHashSuffix=${OVERCLOUD_SWIFT_HASH} \
     -P SwiftPassword=${OVERCLOUD_SWIFT_PASSWORD} \
+    -P NeutronNetworkType=${NEUTRON_NETWORK_TYPE} \
+    -P NeutronTunnelTypes=${NEUTRON_TUNNEL_TYPES} \
     "}