x
/
packstack
Code Issues Proposed changes

exposes tempest uri/branch selection if provision-tempest is y 

this will make possible to pass via cmd args a custom uri and
tag/branch to be used when checking out tempest

Change-Id: I9e6db8f1383c1f9f406d8becafcb0dc7d2741351
This commit is contained in:
Giulio Fidente 2013-10-23 14:31:51 +02:00
parent d3bb52e0a2
commit c2c4c5038a
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packstack/plugins/provision_700.py
View File

@ -66,6 +66,8 @@ def initConfig(controllerObject):
"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?",
@ -75,7 +77,7 @@ def initConfig(controllerObject):
"MASK_INPUT" : False,
"LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_PROVISION_TEMPEST_REPO_URI",
"USE_DEFAULT" : True,
"USE_DEFAULT" : False,
"NEED_CONFIRM" : False,
"CONDITION" : False },
{"CMD_OPTION" : "provision-tempest-repo-revision",
@ -87,7 +89,7 @@ def initConfig(controllerObject):
"MASK_INPUT" : False,
"LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_PROVISION_TEMPEST_REPO_REVISION",
"USE_DEFAULT" : True,
"USE_DEFAULT" : False,
"NEED_CONFIRM" : False,
"CONDITION" : False },
],
@ -113,6 +115,10 @@ def initConfig(controllerObject):
# resources are implemented).
return is_all_in_one(config)
def check_provisioning_tempest(config):
return allow_provisioning(config) and \
config.get('CONFIG_PROVISION_TEMPEST', 'n') == 'y'
def allow_all_in_one_ovs_bridge(config):
return allow_provisioning(config) and \
config['CONFIG_NEUTRON_INSTALL'] == 'y' and \
@ -131,6 +137,12 @@ def initConfig(controllerObject):
"PRE_CONDITION_MATCH" : True,
"POST_CONDITION" : False,
"POST_CONDITION_MATCH" : True },
{ "GROUP_NAME" : "TEMPEST_GIT_REFS",
"DESCRIPTION" : "Optional tempest git uri and branch",
"PRE_CONDITION" : check_provisioning_tempest,
"PRE_CONDITION_MATCH" : True,
"POST_CONDITION" : False,
"POST_CONDITION_MATCH" : True },
{ "GROUP_NAME" : "PROVISION_ALL_IN_ONE_OVS_BRIDGE",
"DESCRIPTION" : "Provisioning all-in-one ovs bridge config",
"PRE_CONDITION" : allow_all_in_one_ovs_bridge,