x
/
packstack
Code Issues Proposed changes

Make demo floating_range configurable 

Change-Id: I5277cd66480c0c7743af326c9baf16278dc00fe8
Resolves: rhbz#999240
This commit is contained in:
Terry Wilson 2013-08-06 04:10:30 -05:00
parent e6b5b87751
commit e244d5fbe8
2 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packstack/plugins/provision_700.py
View File

@ -46,6 +46,18 @@ def initConfig(controllerObject):
"USE_DEFAULT" : False,
"NEED_CONFIRM" : False,
"CONDITION" : False },
{"CMD_OPTION" : "provision-demo-floatrange",
"USAGE" : "The CIDR network address for the floating IP subnet",
"PROMPT" : "Enter the network address for the floating IP subet:",
"OPTION_LIST" : False,
"VALIDATORS" : False,
"DEFAULT_VALUE" : "172.24.4.224/28",
"MASK_INPUT" : False,
"LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_PROVISION_DEMO_FLOATRANGE",
"USE_DEFAULT" : False,
"NEED_CONFIRM" : False,
"CONDITION" : False },
],
"PROVISION_TEMPEST" : [
{"CMD_OPTION" : "provision-tempest",

43
packstack/puppet/templates/provision.pp
View File

@ -5,28 +5,31 @@ class { 'openstack::provision':
tempest_repo_uri => '%(CONFIG_PROVISION_TEMPEST_REPO_URI)s',
tempest_repo_revision => '%(CONFIG_PROVISION_TEMPEST_REPO_REVISION)s',
setup_ovs_bridge => %(CONFIG_PROVISION_ALL_IN_ONE_OVS_BRIDGE)s,
public_bridge_name => '%(CONFIG_NEUTRON_L3_EXT_BRIDGE)s'
public_bridge_name => '%(CONFIG_NEUTRON_L3_EXT_BRIDGE)s',
floating_range => '%(CONFIG_PROVISION_DEMO_FLOATRANGE)s',
}
firewall { '000 nat':
chain => 'POSTROUTING',
jump => 'MASQUERADE',
source => $::openstack::provision::floating_range,
outiface => $::gateway_device,
table => 'nat',
proto => 'all',
}
if %(CONFIG_PROVISION_ALL_IN_ONE_OVS_BRIDGE)s {
firewall { '000 nat':
chain => 'POSTROUTING',
jump => 'MASQUERADE',
source => $::openstack::provision::floating_range,
outiface => $::gateway_device,
table => 'nat',
proto => 'all',
}
firewall { '000 forward out':
chain => 'FORWARD',
action => 'accept',
outiface => '%(CONFIG_NEUTRON_L3_EXT_BRIDGE)s',
proto => 'all',
}
firewall { '000 forward out':
chain => 'FORWARD',
action => 'accept',
outiface => '%(CONFIG_NEUTRON_L3_EXT_BRIDGE)s',
proto => 'all',
}
firewall { '000 forward in':
chain => 'FORWARD',
action => 'accept',
iniface => '%(CONFIG_NEUTRON_L3_EXT_BRIDGE)s',
proto => 'all',
firewall { '000 forward in':
chain => 'FORWARD',
action => 'accept',
iniface => '%(CONFIG_NEUTRON_L3_EXT_BRIDGE)s',
proto => 'all',
}
}