From 272f5de85b52c2397078b2eab9d9e8f3e3762438 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Tue, 5 Mar 2019 15:42:01 +0200 Subject: [PATCH] Stop outputting overcloudrc.v3 from workflow This is no longer needed as we've ship keystone v3 by default for some relaases now. overcloudrc has the same content. Related-Bug: #1733640 Depends-On: I137e08213ef7f0f49510e2ebc905e351fb25b85a Change-Id: Iaafef5b49802e1ea25f374014ebf8632ad0bcc31 --- .../notes/remove-overcloudrc.v3-2118c053035c1439.yaml | 6 ++++++ tripleo_common/actions/deployment.py | 2 +- tripleo_common/tests/utils/test_overcloudrc.py | 6 ------ tripleo_common/utils/overcloudrc.py | 1 - 4 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 releasenotes/notes/remove-overcloudrc.v3-2118c053035c1439.yaml diff --git a/releasenotes/notes/remove-overcloudrc.v3-2118c053035c1439.yaml b/releasenotes/notes/remove-overcloudrc.v3-2118c053035c1439.yaml new file mode 100644 index 000000000..78c532559 --- /dev/null +++ b/releasenotes/notes/remove-overcloudrc.v3-2118c053035c1439.yaml @@ -0,0 +1,6 @@ +--- +deprecations: + - | + overcloudrc.v3 is no longer generated from the overcloudrc workflow. This + is due to the fact that we've been shipping keystone v3 by default for some + releases now, and we have the same contents available in overcloudrc. diff --git a/tripleo_common/actions/deployment.py b/tripleo_common/actions/deployment.py index 9a1988601..6f0a9c31d 100644 --- a/tripleo_common/actions/deployment.py +++ b/tripleo_common/actions/deployment.py @@ -263,7 +263,7 @@ class DeployStackAction(templates.ProcessTemplatesAction): class OvercloudRcAction(base.TripleOAction): - """Generate the overcloudrc and overcloudrc.v3 for a plan + """Generate the overcloudrc for a plan Given the name of a container, generate the overcloudrc files needed to access the overcloud via the CLI. diff --git a/tripleo_common/tests/utils/test_overcloudrc.py b/tripleo_common/tests/utils/test_overcloudrc.py index e3d280617..4e219cf5c 100644 --- a/tripleo_common/tests/utils/test_overcloudrc.py +++ b/tripleo_common/tests/utils/test_overcloudrc.py @@ -38,16 +38,10 @@ class OvercloudRcTest(base.TestCase): "regionTwo") self.assertIn("OS_PASSWORD=AdminPassword", result['overcloudrc']) - self.assertIn("OS_PASSWORD=AdminPassword", result['overcloudrc.v3']) 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']) - self.assertIn(overcloudrc.CLOUDPROMPT, result['overcloudrc.v3']) self.assertIn("OS_AUTH_TYPE=password", result['overcloudrc']) - self.assertIn("OS_AUTH_TYPE=password", result['overcloudrc.v3']) self.assertIn("OS_AUTH_URL=http://foo.com:8000/", result['overcloudrc']) - self.assertIn("OS_AUTH_URL=http://foo.com:8000/", - result['overcloudrc.v3']) self.assertIn("OS_REGION_NAME=regionTwo", result['overcloudrc']) diff --git a/tripleo_common/utils/overcloudrc.py b/tripleo_common/utils/overcloudrc.py index 06c675fa5..b8ca194f7 100644 --- a/tripleo_common/utils/overcloudrc.py +++ b/tripleo_common/utils/overcloudrc.py @@ -115,5 +115,4 @@ def create_overcloudrc(stack, no_proxy, admin_password, region_name): return { "overcloudrc": overcloudrc, - "overcloudrc.v3": overcloudrc }