From 25e52b9939a7ff228ccc0276e5e62c2860c21757 Mon Sep 17 00:00:00 2001 From: James Slagle <jslagle@redhat.com> Date: Tue, 5 Aug 2014 17:58:15 -0400 Subject: [PATCH] Add parameters for choosing vxlan or gre --- deploy-baremetal-overcloudrc | 2 ++ deploy-virt-overcloudrc | 2 ++ scripts/instack-deploy-overcloud | 2 ++ 3 files changed, 6 insertions(+) diff --git a/deploy-baremetal-overcloudrc b/deploy-baremetal-overcloudrc index ec0aee703..ab07cdfae 100644 --- a/deploy-baremetal-overcloudrc +++ b/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 diff --git a/deploy-virt-overcloudrc b/deploy-virt-overcloudrc index 0e771aea9..3930b8582 100644 --- a/deploy-virt-overcloudrc +++ b/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 diff --git a/scripts/instack-deploy-overcloud b/scripts/instack-deploy-overcloud index 57fb4bf99..c8877179c 100755 --- a/scripts/instack-deploy-overcloud +++ b/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} \ "}