From 68028747f7660d22ea4f5c83eb7af126eb6991a1 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Thu, 2 Jan 2020 08:40:57 -0700 Subject: [PATCH] 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 (cherry picked from commit 45ab26770cff0c5672c8924ae93386b1e881b31b) --- tripleo_common/tests/utils/test_overcloudrc.py | 3 +++ tripleo_common/utils/overcloudrc.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tripleo_common/tests/utils/test_overcloudrc.py b/tripleo_common/tests/utils/test_overcloudrc.py index 41e6c4f75..e54b9d16c 100644 --- a/tripleo_common/tests/utils/test_overcloudrc.py +++ b/tripleo_common/tests/utils/test_overcloudrc.py @@ -41,6 +41,9 @@ class OvercloudRcTest(base.TestCase): result['overcloudrc']) self.assertIn("OS_PASSWORD=AdminPassword", result['overcloudrc']) self.assertIn("OS_PASSWORD=AdminPassword", result['overcloudrc.v3']) + + 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.v3']) self.assertIn(overcloudrc.CLOUDPROMPT, result['overcloudrc']) diff --git a/tripleo_common/utils/overcloudrc.py b/tripleo_common/utils/overcloudrc.py index b042c68cb..79b5c296f 100644 --- a/tripleo_common/utils/overcloudrc.py +++ b/tripleo_common/utils/overcloudrc.py @@ -101,8 +101,8 @@ def create_overcloudrc(stack, no_proxy, admin_password, region_name): 'OS_NO_CACHE': 'True', 'OS_CLOUDNAME': stack.stack_name, 'no_proxy': ','.join(no_proxy_list), - 'PYTHONWARNINGS': ('"ignore:Certificate has no, ignore:A true ' - 'SSLContext object is not available"'), + 'PYTHONWARNINGS': ('ignore:Certificate has no, ignore:A true ' + 'SSLContext object is not available'), 'OS_AUTH_TYPE': 'password', 'OS_PASSWORD': admin_password, 'OS_AUTH_URL': overcloud_endpoint.replace('/v2.0', '') + '/v3',