x/packstack
Code Issues Proposed changes

Allow tempest repo uri and revision configuration

Browse Source 
* Different revisions of tempest are required for different
   releases of openstack, so it is helpful to be able to choose
   the git repo and repo revision that will be deployed.
 * The vcsrepo submodule is updated so that remote revisions are
   supported - previously providing a git revision did not work.

Change-Id: If89c06d7c909dd4e5cc7b5b07291bf526a22ea70
This commit is contained in:
Maru Newby
2013-07-31 21:51:10 -07:00
parent 72bd04243c
commit 0218ca12d4
4 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packstack/installer/run_setup.py
View File

@@ -826,7 +826,14 @@ def validateSingleFlag(options, flag):
raise FlagValidationError(msg)
def setProvisioningDefaults():
pnames = ['CONFIG_PROVISION_' + x for x in ['DEMO', 'TEMPEST', 'ALL_IN_ONE_OVS_BRIDGE']]
conf_ids = [
'DEMO',
'TEMPEST',
'TEMPEST_REPO_URI',
'TEMPEST_REPO_REVISION',
'ALL_IN_ONE_OVS_BRIDGE',
]
pnames = ['CONFIG_PROVISION_' + x for x in conf_ids]
params = [controller.getParamByName(x) for x in pnames]
for param in params:
controller.CONF[param.CONF_NAME] = (

24
packstack/plugins/provision_700.py
View File

@@ -60,6 +60,30 @@ def initConfig(controllerObject):
"USE_DEFAULT" : False,
"NEED_CONFIRM" : False,
"CONDITION" : False },
{"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?",
"OPTION_LIST" : [],
"VALIDATORS" : [validators.validate_not_empty],
"DEFAULT_VALUE" : "https://github.com/redhat-openstack/tempest.git",
"MASK_INPUT" : False,
"LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_PROVISION_TEMPEST_REPO_URI",
"USE_DEFAULT" : True,
"NEED_CONFIRM" : False,
"CONDITION" : False },
{"CMD_OPTION" : "provision-tempest-repo-revision",
"USAGE" : "The revision of the tempest git repository to use",
"PROMPT" : "What revision, branch, or tag of the Tempest git repository should be used?",
"OPTION_LIST" : [],
"VALIDATORS" : [validators.validate_not_empty],
"DEFAULT_VALUE" : "master",
"MASK_INPUT" : False,
"LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_PROVISION_TEMPEST_REPO_REVISION",
"USE_DEFAULT" : True,
"NEED_CONFIRM" : False,
"CONDITION" : False },
],
"PROVISION_ALL_IN_ONE_OVS_BRIDGE" : [
{"CMD_OPTION" : "provision-all-in-one-ovs-bridge",

2
packstack/puppet/modules/vcsrepo

Submodule packstack/puppet/modules/vcsrepo updated: 2c81045b53...6f7507a2a4

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

@@ -1,9 +1,11 @@
class { 'openstack::provision':
admin_password => '%(CONFIG_KEYSTONE_ADMIN_PW)s',
password => '%(CONFIG_KEYSTONE_DEMO_PW)s',
configure_tempest => %(CONFIG_PROVISION_TEMPEST)s,
setup_ovs_bridge => %(CONFIG_PROVISION_ALL_IN_ONE_OVS_BRIDGE)s,
public_bridge_name => '%(CONFIG_NEUTRON_L3_EXT_BRIDGE)s'
admin_password => '%(CONFIG_KEYSTONE_ADMIN_PW)s',
password => '%(CONFIG_KEYSTONE_DEMO_PW)s',
configure_tempest => %(CONFIG_PROVISION_TEMPEST)s,
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'
}
firewall { '000 nat':