Merge "overcloud-deploy: Only support pre-provisioned node"

releasenotes/notes/oc-deploy-force-pre-provisioned-b50159643a31b3d2.yaml

@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Overcloud deployment no longer supports deploying overcloud nodes by Heat.
+    Because of this change, the ``openstack overcloud deploy`` command now
+    always fails if the ``--provisioned-nodes`` option is used.

tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py

@@ -854,6 +854,13 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
         with open(reg_file, 'w+') as temp_file:
             temp_file.write('resource_registry:\n  Test2: OS::Heat::None')
 
+        os.makedirs(self.tmp_dir.join('tripleo-heat-templates/environments'))
+        deployed_server_file = self.tmp_dir.join(
+            'tripleo-heat-templates/environments/'
+            'deployed-server-environment.yaml')
+        with open(deployed_server_file, 'w+') as temp_file:
+            temp_file.write('')
+
         test_answerfile = self.tmp_dir.join('answerfile')
         with open(test_answerfile, 'w') as answerfile:
             yaml.dump(
@@ -867,7 +874,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
         arglist = ['--answers-file', test_answerfile,
                    '--environment-file', test_env2,
                    '--disable-password-generation',
-                   '--provision-nodes',
                    '--working-dir', self.tmp_dir.path]
         verifylist = [
             ('answers_file', test_answerfile),
@@ -1058,10 +1064,9 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
         self.useFixture(utils_oc_fixture)
         utils_fixture = deployment.UtilsFixture()
         self.useFixture(utils_fixture)
-        arglist = ['--templates', '--deployed-server', '--disable-validations']
+        arglist = ['--templates', '--disable-validations']
         verifylist = [
             ('templates', '/usr/share/openstack-tripleo-heat-templates/'),
-            ('deployed_server', True),
             ('disable_validations', True),
         ]
 

tripleoclient/v1/overcloud_deploy.py

@@ -78,10 +78,9 @@ def _validate_args(parsed_args):
         raise oscexc.CommandError(
             "You must specify either --templates or --answers-file")
 
-    if parsed_args.baremetal_deployment and not parsed_args.deployed_server:
+    if not parsed_args.deployed_server:
         raise oscexc.CommandError(
-            "Error: --deployed-server must be used when using "
-            "--baremetal-deployment")
+            "Error: --provision-node is no longer supported")
 
     if (parsed_args.baremetal_deployment
             and (parsed_args.config_download_only or parsed_args.setup_only)):
@@ -146,9 +145,6 @@ class DeployOvercloud(command.Command):
     def _setup_clients(self, parsed_args):
         self.clients = self.app.client_manager
         self.orchestration_client = self.clients.orchestration
-        if not parsed_args.deployed_server:
-            self.compute_client = self.clients.compute
-            self.baremetal_client = self.clients.baremetal
 
     def _update_parameters(self, args, parameters,
                            tht_root, user_tht_root):
@@ -270,11 +266,10 @@ class DeployOvercloud(command.Command):
             parameters, new_tht_root, parsed_args.stack)
         created_env_files.extend(param_env)
 
-        if parsed_args.deployed_server:
-            created_env_files.append(
-                os.path.join(
-                    new_tht_root,
-                    constants.DEPLOYED_SERVER_ENVIRONMENT))
+        created_env_files.append(
+            os.path.join(
+                new_tht_root,
+                constants.DEPLOYED_SERVER_ENVIRONMENT))
 
         if parsed_args.baremetal_deployment is not None:
             created_env_files.extend(
@@ -781,7 +776,8 @@ class DeployOvercloud(command.Command):
             action='store_false',
             dest='deployed_server',
             default=True,
-            help=_('Provision overcloud nodes with heat.')
+            help=_('DEPRECATED: Provision overcloud nodes with heat.'
+                   'This method is no longer supported.')
         )
         parser.add_argument(
             '--config-download',