Merge "Make --deployed-server the default"

releasenotes/notes/deployed_server_default-0c2267c7588056fc.yaml

@@ -0,0 +1,7 @@
+---
+deprecations:
+  - Ephemeral heat is now used as default for overcloud deployment
+    and assumes the nodes are pre-provisioned using metalsmith. Deprecates
+    existing ``--deployed-server`` option and adds an additional option
+    ``--provision-nodes`` for using installed heat and provisioning
+    nodes with heat.

tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py

@@ -835,7 +835,8 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
                           mock_roles_data, mock_image_prepare,
                           mock_generate_password, mock_rc_params,
                           mock_check_service_vip_migr,
-                          mock_provision_networks, mock_provision_virtual_ips):
+                          mock_provision_networks,
+                          mock_provision_virtual_ips):
         mock_tmpdir.return_value = self.tmp_dir.path
         fixture = deployment.DeploymentWorkflowFixture()
         self.useFixture(fixture)
@@ -868,6 +869,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
         os.makedirs(self.tmp_dir.join('tripleo-heat-templates'))
         reg_file = self.tmp_dir.join(
             'tripleo-heat-templates/overcloud-resource-registry-puppet.yaml')
+
         with open(reg_file, 'w+') as temp_file:
             temp_file.write('resource_registry:\n  Test2: OS::Heat::None')
 
@@ -884,6 +886,7 @@ 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),

tripleoclient/v1/overcloud_deploy.py

@@ -27,7 +27,6 @@ import urllib
 import yaml
 
 from heatclient.common import template_utils
-from keystoneauth1.exceptions.catalog import EndpointNotFound
 from osc_lib import exceptions as oscexc
 from osc_lib.i18n import _
 from tripleo_common import update
@@ -144,13 +143,8 @@ class DeployOvercloud(command.Command):
         self.clients = self.app.client_manager
         self.orchestration_client = self.clients.orchestration
         if not parsed_args.deployed_server:
-            try:
-                self.compute_client = self.clients.compute
-                self.baremetal_client = self.clients.baremetal
-            except EndpointNotFound:
-                self.log.warning('WARNING: Nova endpoint not available. '
-                                 'Assuming --deployed-server')
-                parsed_args.deployed_server = True
+            self.compute_client = self.clients.compute
+            self.baremetal_client = self.clients.baremetal
 
     def _update_parameters(self, args, parameters,
                            tht_root, user_tht_root):
@@ -735,7 +729,7 @@ class DeployOvercloud(command.Command):
         parser.add_argument(
             '--disable-validations',
             action='store_true',
-            default=False,
+            default=True,
             help=_('DEPRECATED. Disable the pre-deployment validations '
                    'entirely. These validations are the built-in '
                    'pre-deployment validations. To enable external '
@@ -802,11 +796,16 @@ class DeployOvercloud(command.Command):
         parser.add_argument(
             '--deployed-server',
             action='store_true',
-            default=False,
-            help=_('Use pre-provisioned overcloud nodes. Removes baremetal,'
-                   'compute and image services requirements from the'
-                   'undercloud node. Must only be used with the'
-                   '--disable-validations.')
+            default=True,
+            help=_('DEPRECATED: Use pre-provisioned overcloud nodes.'
+                   'Now the default and this CLI option has no effect.')
+        )
+        parser.add_argument(
+            '--provision-nodes',
+            action='store_false',
+            dest='deployed_server',
+            default=True,
+            help=_('Provision overcloud nodes with heat.')
         )
         parser.add_argument(
             '--config-download',