openstack
/
instack-undercloud
Code Issues Proposed changes

Allow setting $BM_NETWORK_GATEWAY

This commit is contained in:
James Slagle 2014-10-29 16:52:42 -04:00
parent f0fceabaec
commit 7ceb60b95f
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deploy-baremetal-overcloudrc
View File

@ -5,6 +5,7 @@ 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 BM_NETWORK_GATEWAY="172.17.0.1"
export NEUTRON_NETWORK_TYPE=gre
export NEUTRON_TUNNEL_TYPES=gre
export COMPUTESCALE=1

1
deploy-virt-overcloudrc
View File

@ -6,6 +6,7 @@ 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 BM_NETWORK_GATEWAY=192.0.2.1
export NEUTRON_NETWORK_TYPE=gre
export NEUTRON_TUNNEL_TYPES=gre
export COMPUTESCALE=1

2
scripts/instack-deploy-overcloud
View File

@ -282,7 +282,7 @@ FLOATING_IP_START=${FLOATING_IP_START:-"172.17.0.45"}
FLOATING_IP_END=${FLOATING_IP_END:-"172.17.0.64"}
FLOATING_IP_CIDR=${FLOATING_IP_CIDR:-"172.17.0.0/16"}
OVERCLOUD_NAMESERVER="8.8.8.8"
BM_NETWORK_GATEWAY="192.0.2.1"
BM_NETWORK_GATEWAY=${BM_NETWORK_GATEWAY:-"172.17.0.1"}
NETWORK_JSON=$(mktemp)
jq "." <<EOF > $NETWORK_JSON