Add insecure option in functional tests for SSL endpoints
This patch fixes the issue when functional tests are run against a deployment that has https based endpoints. The insecure option is not being passed when initiating magnumclient or keystoneclient as a result we get SSL error. Change-Id: I35525917b96b64e57c984924c72b3c696949f67f Closes-Bug: #1640341
This commit is contained in:
parent
fad39cf881
commit
07f9e027d5
|
@ -6,6 +6,7 @@ username = demo
|
|||
tenant_name = demo
|
||||
password = password
|
||||
auth_version = v2
|
||||
insecure=False
|
||||
[admin]
|
||||
user = admin
|
||||
tenant = admin
|
||||
|
|
|
@ -76,6 +76,7 @@ username = $OS_USERNAME
|
|||
tenant_name = $OS_TENANT_NAME
|
||||
password = $OS_PASSWORD
|
||||
auth_version = v2
|
||||
insecure = False
|
||||
[admin]
|
||||
user = $OS_USERNAME
|
||||
tenant = $OS_TENANT_NAME
|
||||
|
|
|
@ -56,6 +56,7 @@ class BaseMagnumClient(base.BaseMagnumTest):
|
|||
tenant = cliutils.env('OS_TENANT_NAME')
|
||||
tenant_id = cliutils.env('OS_TENANT_ID')
|
||||
auth_url = cliutils.env('OS_AUTH_URL')
|
||||
insecure = cliutils.env('INSECURE')
|
||||
region_name = cliutils.env('OS_REGION_NAME')
|
||||
magnum_url = cliutils.env('BYPASS_URL')
|
||||
image_id = cliutils.env('IMAGE_ID')
|
||||
|
@ -74,6 +75,7 @@ class BaseMagnumClient(base.BaseMagnumTest):
|
|||
passwd = passwd or config.get('admin', 'pass')
|
||||
tenant = tenant or config.get('admin', 'tenant')
|
||||
auth_url = auth_url or config.get('auth', 'auth_url')
|
||||
insecure = insecure or config.get('auth', 'insecure')
|
||||
magnum_url = magnum_url or config.get('auth', 'magnum_url')
|
||||
image_id = image_id or config.get('magnum', 'image_id')
|
||||
nic_id = nic_id or config.get('magnum', 'nic_id')
|
||||
|
@ -100,13 +102,15 @@ class BaseMagnumClient(base.BaseMagnumTest):
|
|||
project_id=tenant_id,
|
||||
project_name=tenant,
|
||||
auth_url=auth_url,
|
||||
insecure=insecure,
|
||||
service_type='container-infra',
|
||||
region_name=region_name,
|
||||
magnum_url=magnum_url)
|
||||
cls.keystone = ksclient.Client(username=user,
|
||||
password=passwd,
|
||||
tenant_name=tenant,
|
||||
auth_url=auth_url)
|
||||
auth_url=auth_url,
|
||||
insecure=insecure)
|
||||
token = cls.keystone.auth_token
|
||||
heat_endpoint = cls.keystone.service_catalog.url_for(
|
||||
service_type='orchestration')
|
||||
|
|
Loading…
Reference in New Issue