Fix quoting for PYTHONWARNINGS
The fix for 1854868 introduced double quoting for the PYTHONWARNINGS variable which leads to a message about an Invalid -W option being displayed. Change-Id: I6a9b2704a9c6c7c1c9903532a5423408ede8ffc9 Closes-Bug: #1858113
This commit is contained in:
parent
5943c118b3
commit
45ab26770c
|
@ -40,6 +40,9 @@ class OvercloudRcTest(base.TestCase):
|
||||||
self.assertIn("export no_proxy='foo,foo.com,[fd00::1]'",
|
self.assertIn("export no_proxy='foo,foo.com,[fd00::1]'",
|
||||||
result['overcloudrc'])
|
result['overcloudrc'])
|
||||||
self.assertIn("OS_PASSWORD=AdminPassword", result['overcloudrc'])
|
self.assertIn("OS_PASSWORD=AdminPassword", result['overcloudrc'])
|
||||||
|
|
||||||
|
self.assertIn("export PYTHONWARNINGS='ignore:Certificate",
|
||||||
|
result['overcloudrc'])
|
||||||
self.assertIn("OS_IDENTITY_API_VERSION=3", result['overcloudrc'])
|
self.assertIn("OS_IDENTITY_API_VERSION=3", result['overcloudrc'])
|
||||||
self.assertIn(overcloudrc.CLOUDPROMPT, result['overcloudrc'])
|
self.assertIn(overcloudrc.CLOUDPROMPT, result['overcloudrc'])
|
||||||
self.assertIn("OS_AUTH_TYPE=password", result['overcloudrc'])
|
self.assertIn("OS_AUTH_TYPE=password", result['overcloudrc'])
|
||||||
|
|
|
@ -89,8 +89,8 @@ def create_overcloudrc(stack, no_proxy, admin_password, region_name):
|
||||||
'OS_NO_CACHE': 'True',
|
'OS_NO_CACHE': 'True',
|
||||||
'OS_CLOUDNAME': stack.stack_name,
|
'OS_CLOUDNAME': stack.stack_name,
|
||||||
'no_proxy': ','.join(no_proxy_list),
|
'no_proxy': ','.join(no_proxy_list),
|
||||||
'PYTHONWARNINGS': ('"ignore:Certificate has no, ignore:A true '
|
'PYTHONWARNINGS': ('ignore:Certificate has no, ignore:A true '
|
||||||
'SSLContext object is not available"'),
|
'SSLContext object is not available'),
|
||||||
'OS_AUTH_TYPE': 'password',
|
'OS_AUTH_TYPE': 'password',
|
||||||
'OS_PASSWORD': admin_password,
|
'OS_PASSWORD': admin_password,
|
||||||
'OS_AUTH_URL': overcloud_endpoint.replace('/v2.0', ''),
|
'OS_AUTH_URL': overcloud_endpoint.replace('/v2.0', ''),
|
||||||
|
|
Loading…
Reference in New Issue