Include default region for multiregion testbed
Functional tests need to have configured the default region when there is a testbed with multiples regions. Partially Closes Bug: #1479260 Change-Id: Ib9488c7632fe88a22b014f5e251b48d12fa1dbce
This commit is contained in:
parent
6cc0024a87
commit
cf44ac9e72
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
|
||||
|
Loading…
x
Reference in New Issue
Block a user