From 977bc6f1b864c2cee9a92c9de1acee109d5e0195 Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Tue, 21 Nov 2017 16:45:35 +0000 Subject: [PATCH] Remove the overcloudrc.v3 file The default file is now v3, so these will always be the same. Related-Bug: #1733640 Depends-On: I5e779f48a02c5389cebf84e9d3899250d63cace8 Change-Id: I3612c58c356f8955bd44655cf5aacc20be532cbc --- .../notes/remove-overcloudrc-v3-088643d24a622473.yaml | 8 ++++++++ tripleoclient/tests/test_overcloud_credentials.py | 10 ++-------- tripleoclient/tests/test_utils.py | 10 ++-------- tripleoclient/utils.py | 4 ---- tripleoclient/v1/overcloud_credentials.py | 2 +- 5 files changed, 13 insertions(+), 21 deletions(-) create mode 100644 releasenotes/notes/remove-overcloudrc-v3-088643d24a622473.yaml diff --git a/releasenotes/notes/remove-overcloudrc-v3-088643d24a622473.yaml b/releasenotes/notes/remove-overcloudrc-v3-088643d24a622473.yaml new file mode 100644 index 000000000..9db1c27fb --- /dev/null +++ b/releasenotes/notes/remove-overcloudrc-v3-088643d24a622473.yaml @@ -0,0 +1,8 @@ +--- +deprecations: + - | + List deprecations notes here, or remove this section. All of the list + items in this section are combined when the release notes are rendered, so + the text needs to be worded so that it does not depend on any information + only available in another section, such as the prelude. This may mean + repeating some details. diff --git a/tripleoclient/tests/test_overcloud_credentials.py b/tripleoclient/tests/test_overcloud_credentials.py index c0e5b63c9..0e1e1efa4 100644 --- a/tripleoclient/tests/test_overcloud_credentials.py +++ b/tripleoclient/tests/test_overcloud_credentials.py @@ -31,7 +31,6 @@ class TestOvercloudCredentials(test_plugin.TestPluginV1): output=json.dumps({ "result": { "overcloudrc": "OVERCLOUDRC CONTENTS", - "overcloudrc.v3": "OVERCLOUDRC.v3 CONTENTS", } }) ) @@ -49,10 +48,8 @@ class TestOvercloudCredentials(test_plugin.TestPluginV1): self.cmd.take_action(parsed_args) self.assertIn(mock.call('./overcloudrc', 'w'), m.call_args_list) - self.assertIn(mock.call('./overcloudrc.v3', 'w'), m.call_args_list) mock_chmod.assert_has_calls([ - mock.call('./overcloudrc', 384), - mock.call('./overcloudrc.v3', 384)]) + mock.call('./overcloudrc', 384)]) self.workflow.action_executions.create.assert_called_once_with( 'tripleo.deployment.overcloudrc', {'container': 'overcloud'}, @@ -75,13 +72,10 @@ class TestOvercloudCredentials(test_plugin.TestPluginV1): self.cmd.take_action(parsed_args) path = "{}/overcloudrc".format(temp) - pathv3 = "{}/overcloudrc.v3".format(temp) self.assertIn(mock.call(path, 'w'), m.call_args_list) - self.assertIn(mock.call(pathv3, 'w'), m.call_args_list) mock_chmod.assert_has_calls([ - mock.call(path, 384), - mock.call(pathv3, 384)]) + mock.call(path, 384)]) self.workflow.action_executions.create.assert_called_once_with( 'tripleo.deployment.overcloudrc', {'container': 'overcloud'}, diff --git a/tripleoclient/tests/test_utils.py b/tripleoclient/tests/test_utils.py index d7ac3bd61..10fce1865 100644 --- a/tripleoclient/tests/test_utils.py +++ b/tripleoclient/tests/test_utils.py @@ -212,25 +212,19 @@ class TestCreateOvercloudRC(TestCase): tempdir = tempfile.mkdtemp() rcfile = os.path.join(tempdir, 'teststackrc') - rcfile_v3 = os.path.join(tempdir, 'teststackrc.v3') overcloudrcs = { - "overcloudrc": "overcloudrc not v3", - "overcloudrc.v3": "overcloudrc.v3", + "overcloudrc": "overcloudrc v3 is the only version", } try: utils.write_overcloudrc(stack_name, overcloudrcs, config_directory=tempdir) rc = open(rcfile, 'rt').read() - self.assertIn('overcloudrc not v3', rc) - rc_v3 = open(rcfile_v3, 'rt').read() - self.assertIn('overcloudrc.v3', rc_v3) + self.assertIn('overcloudrc v3', rc) finally: if os.path.exists(rcfile): os.unlink(rcfile) - if os.path.exists(rcfile_v3): - os.unlink(rcfile_v3) os.rmdir(tempdir) diff --git a/tripleoclient/utils.py b/tripleoclient/utils.py index a29dce50f..ddc2f8a5a 100644 --- a/tripleoclient/utils.py +++ b/tripleoclient/utils.py @@ -53,15 +53,11 @@ def write_overcloudrc(stack_name, overcloudrcs, config_directory='.'): """Write the overcloudrc files""" rcpath = os.path.join(config_directory, '%src' % stack_name) - rcv3path = os.path.join(config_directory, '%src.v3' % stack_name) with open(rcpath, 'w') as rcfile: rcfile.write(overcloudrcs['overcloudrc']) os.chmod(rcpath, 0o600) - with open(rcv3path, 'w') as rcv3file: - rcv3file.write(overcloudrcs['overcloudrc.v3']) - os.chmod(rcv3path, 0o600) return os.path.abspath(rcpath) diff --git a/tripleoclient/v1/overcloud_credentials.py b/tripleoclient/v1/overcloud_credentials.py index dd99ccd6e..b1560d4af 100644 --- a/tripleoclient/v1/overcloud_credentials.py +++ b/tripleoclient/v1/overcloud_credentials.py @@ -18,7 +18,7 @@ from tripleoclient.workflows import deployment class OvercloudCredentials(command.Command): - """Create the overcloudrc and overcloudrc.v3 files""" + """Create the overcloudrc file""" log = logging.getLogger(__name__ + ".OvercloudCredentials")