Remove overcloudrc.v3 generation

We've been deploying with keystone v3 for some releases now, so it's
time to get rid of this file; given that it's the same content as
overcloudrc.

Change-Id: I137e08213ef7f0f49510e2ebc905e351fb25b85a
Closes-Bug: #1733640

releasenotes/notes/stop-generating-overcloudrc.v3-65ea476a29cfc4bb.yaml

@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    The overcloudrc.v3 file is no longer generated. The same contents are
+    available in overcloudrc.

tripleoclient/tests/test_overcloud_credentials.py

@@ -42,7 +42,6 @@ class TestOvercloudCredentials(test_plugin.TestPluginV1):
             "status": "SUCCESS",
             "message": {
                 "overcloudrc": "OVERCLOUDRC CONTENTS",
-                "overcloudrc.v3": "OVERCLOUDRC.v3 CONTENTS",
             }
         }])
 
@@ -60,10 +59,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', 384)])
-            mock.call('./overcloudrc.v3', 384)])
 
         self.workflow.executions.create.assert_called_once_with(
             'tripleo.deployment.v1.create_overcloudrc',
@@ -86,13 +83,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(path, 384)])
-            mock.call(pathv3, 384)])
 
         self.workflow.executions.create.assert_called_once_with(
             'tripleo.deployment.v1.create_overcloudrc',

tripleoclient/tests/test_utils.py

@@ -449,25 +449,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": "overcloudrc",
-            "overcloudrc.v3": "overcloudrc.v3",
         }
 
         try:
             utils.write_overcloudrc(stack_name, overcloudrcs,
                                     config_directory=tempdir)
             rc = open(rcfile, 'rt').read()
-            self.assertIn('overcloudrc not v3', rc)
+            self.assertEqual('overcloudrc', rc)
-            rc_v3 = open(rcfile_v3, 'rt').read()
-            self.assertIn('overcloudrc.v3', rc_v3)
         finally:
             if os.path.exists(rcfile):
                 os.unlink(rcfile)
-            if os.path.exists(rcfile_v3):
-                os.unlink(rcfile_v3)
 
             os.rmdir(tempdir)
 

tripleoclient/utils.py

@@ -161,15 +161,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)
 
 

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 files"""
 
     log = logging.getLogger(__name__ + ".OvercloudCredentials")