openstack
/
instack-undercloud
Code Issues Proposed changes

Allow for an IP/netmask to be passed in instack.answers 

Change-Id: I2a359707324042f922112c51325c7778ee9a9732
This commit is contained in:
Victor Lowther 2015-03-19 10:34:15 -05:00 committed by James Slagle
parent f53bca5eff
commit 5f34fa989d
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/undercloud-stack-config/config.json.template
View File

@ -33,7 +33,7 @@
],
"addresses": [
{
"ip_netmask": "{{LOCAL_IP}}/24"
"ip_netmask": "{{PUBLIC_INTERFACE_IP}}"
}
]
}

1
elements/undercloud-stack-config/install.d/02-undercloud-stack-heat-metadata
View File

@ -16,6 +16,7 @@ template = os.path.join(os.path.dirname(__file__),
context = {
'LOCAL_IP': os.environ.get('LOCAL_IP', '192.0.2.1'),
'PUBLIC_INTERFACE_IP': os.environ.get('PUBLIC_INTERFACE_IP', '192.0.2.1/24'),
'LOCAL_INTERFACE': os.environ.get('LOCAL_INTERFACE', 'eth1'),
'MASQUERADE_NETWORK': os.environ.get('MASQUERADE_NETWORK', '192.0.2.0/24'),
'DHCP_START': os.environ.get('DHCP_START', '192.0.2.5'),

5
instack.answers.sample
View File

@ -16,8 +16,9 @@ IMAGE_PATH=.
### LOCAL_IP ###
# IP address to assign to the interface on the Undercloud that will
# be handling the PXE boots and DHCP for Overcloud instances.
# LOCAL_IP will be assigned to LOCAL_INTERFACE
LOCAL_IP=192.0.2.1
# LOCAL_IP will be assigned to LOCAL_INTERFACE, and must be in
# IP/PREFIX format.
LOCAL_IP=192.0.2.1/24
### LOCAL_INTERFACE ###
# Network interface on the Undercloud that will be handling the PXE boots and

6
scripts/instack-apply-config
View File

@ -13,9 +13,13 @@ vi ~/instack.answers
echo "Sourcing answers file from instack.answers..."
source ~/instack.answers
# Munge up LOCAL_IP. Keep in sync with instack-install-undercloud
export PUBLIC_INTERFACE_IP="$LOCAL_IP"
export LOCAL_IP="${LOCAL_IP%/*}"
export DEPLOYMENT_MODE
export IMAGE_PATH
export LOCAL_IP
export DNSMASQ_START
export DNSMASQ_END
export LOCAL_INTERFACE

7
scripts/instack-install-undercloud
View File

@ -58,9 +58,14 @@ $INSTACKUNDERCLOUDELEMENTS:\
echo "Sourcing answers file from instack.answers..."
source ~/instack.answers
# Munge up LOCAL_IP. Keep in sync with instack-apply-config
export PUBLIC_INTERFACE_IP="$LOCAL_IP"
export LOCAL_IP="${LOCAL_IP%/*}"
export IMAGE_PATH
export LOCAL_INTERFACE
export LOCAL_IP
export MASQUERADE_NETWORK
export DHCP_START
export DHCP_END