Skip to content

Commit

Permalink
Merge "Get rid of puppet-openstack dependency"
Browse files Browse the repository at this point in the history
  • Loading branch information
Jenkins authored and openstack-gerrit committed Feb 7, 2015
2 parents 0a7304e + 4a4f0c1 commit 43406a1
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 26 deletions.
61 changes: 37 additions & 24 deletions packstack/plugins/provision_700.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,39 @@ def process_provision(param, process_args=None):
"USE_DEFAULT": False,
"NEED_CONFIRM": False,
"CONDITION": False},
],

"PROVISION_DEMO": [
{"CMD_OPTION": "provision-demo-floatrange",
"USAGE": "The CIDR network address for the floating IP subnet",
"PROMPT": "Enter the network address for the floating IP subnet",
"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},

{"CMD_OPTION": "provision-cirros-url",
"USAGE": "A URL or local file location for the Cirros demo image "
"used for Glance",
"PROMPT": "Enter the URL or local file location for the Cirros "
"image",
"OPTION_LIST": False,
"VALIDATORS": [validators.validate_not_empty],
"DEFAULT_VALUE": DEMO_CIRRUS_URL,
"MASK_INPUT": False,
"LOOSE_VALIDATION": True,
"CONF_NAME": "CONFIG_PROVISION_CIRROS_URL",
"USE_DEFAULT": False,
"NEED_CONFIRM": False,
"CONDITION": False},
],

"PROVISION_TEMPEST": [
{"CMD_OPTION": "provision-tempest-user",
"USAGE": "The name of the Tempest Provisioning user. If you "
"don't provide a user name, Tempest will be configured "
Expand Down Expand Up @@ -103,39 +135,19 @@ def process_provision(param, process_args=None):
"NEED_CONFIRM": True,
"CONDITION": False},

],

"PROVISION_DEMO": [
{"CMD_OPTION": "provision-demo-floatrange",
{"CMD_OPTION": "provision-tempest-floatrange",
"USAGE": "The CIDR network address for the floating IP subnet",
"PROMPT": "Enter the network address for the floating IP subnet",
"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},

{"CMD_OPTION": "provision-cirros-url",
"USAGE": "A URL or local file location for the Cirros demo image "
"used for Glance",
"PROMPT": "Enter the URL or local file location for the Cirros "
"image",
"OPTION_LIST": False,
"VALIDATORS": [validators.validate_not_empty],
"DEFAULT_VALUE": DEMO_CIRRUS_URL,
"MASK_INPUT": False,
"LOOSE_VALIDATION": True,
"CONF_NAME": "CONFIG_PROVISION_CIRROS_URL",
"CONF_NAME": "CONFIG_PROVISION_TEMPEST_FLOATRANGE",
"USE_DEFAULT": False,
"NEED_CONFIRM": False,
"CONDITION": False},
],

"TEMPEST_GIT_REFS": [
{"CMD_OPTION": "provision-tempest-repo-uri",
"USAGE": "The uri of the tempest git repository to use",
"PROMPT": "What is the uri of the Tempest git repository?",
Expand Down Expand Up @@ -200,12 +212,13 @@ def allow_all_in_one_ovs_bridge(config):

{"GROUP_NAME": "PROVISION_DEMO",
"DESCRIPTION": "Provisioning demo config",
"PRE_CONDITION": check_provisioning_demo,
"PRE_CONDITION_MATCH": True,
"POST_CONDITION": False,
"POST_CONDITION_MATCH": True},

{"GROUP_NAME": "TEMPEST_GIT_REFS",
"DESCRIPTION": "Optional tempest git uri and branch",
{"GROUP_NAME": "PROVISION_TEMPEST",
"DESCRIPTION": "Provisioning tempest config",
"PRE_CONDITION": check_provisioning_tempest,
"PRE_CONDITION_MATCH": True,
"POST_CONDITION": False,
Expand Down
2 changes: 1 addition & 1 deletion packstack/puppet/templates/provision_demo.pp
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
firewall { '000 nat':
chain => 'POSTROUTING',
jump => 'MASQUERADE',
source => $::openstack::provision::floating_range,
source => hiera('CONFIG_PROVISION_DEMO_FLOATRANGE'),
outiface => $::gateway_device,
table => 'nat',
proto => 'all',
Expand Down
2 changes: 1 addition & 1 deletion packstack/puppet/templates/provision_tempest.pp
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
firewall { '000 nat':
chain => 'POSTROUTING',
jump => 'MASQUERADE',
source => $::openstack::provision::floating_range,
source => hiera('CONFIG_PROVISION_TEMPEST_FLOATRANGE'),
outiface => $::gateway_device,
table => 'nat',
proto => 'all',
Expand Down

0 comments on commit 43406a1

Please sign in to comment.