Merge "Include default region for multiregion testbed"

This commit is contained in:
Jenkins 2015-12-01 10:49:47 +00:00 committed by Gerrit Code Review
commit 90a94df925
3 changed files with 9 additions and 3 deletions
murano/tests/functional

@ -76,10 +76,12 @@ class DeployTestMixin(zip_utils.ZipUtilsMixin):
@staticmethod
@memoize
def keystone_client():
region = CONF.murano.region_name
return ksclient.Client(username=CONF.murano.user,
password=CONF.murano.password,
tenant_name=CONF.murano.tenant,
auth_url=CONF.murano.auth_url)
auth_url=CONF.murano.auth_url,
region_name=region)
@classmethod
@memoize

@ -36,4 +36,7 @@
# windows_image = default_windows
# image for hdp sandbox
# hdp_image = hdp-sandbox
# hdp_image = hdp-sandbox
# region name for services
# region_name = None

@ -58,7 +58,8 @@ MuranoGroup = [
help="image for hdp-sandbox"),
cfg.StrOpt('kubernetes_image',
default="ubuntu14.04-x64-kubernetes",
help="image for kubernetes")
help="image for kubernetes"),
cfg.StrOpt('region_name', help="region name for services")
]
CONF = cfg.CONF