Omit empty environment files

The following two environment files are now empty, after we updated
the default in tht to support only pre-provisioned nodes
 - deployed-server-environment(.j2).yaml
 - deployed-server-noop-ctlplane.yaml

This drops usage of these two files so that we can remove these empty
files completely.

Depends-on: https://review.opendev.org/861547
Change-Id: If2a3f1d2d332a930ea9a529088b3a2ab91d50b53

tripleoclient/constants.py

@@ -79,7 +79,6 @@ PASSWORDS_ENV_FORMAT = '{}-passwords.yaml'
 # This directory may contain additional environments to use during deploy
 DEFAULT_ENV_DIRECTORY = os.path.join(os.environ.get('HOME', '~/'),
                                      '.tripleo', 'environments')
-DEPLOYED_SERVER_ENVIRONMENT = 'environments/deployed-server-environment.yaml'
 TRIPLEO_PUPPET_MODULES = "/usr/share/openstack-puppet/modules/"
 PUPPET_MODULES = "/etc/puppet/modules/"
 PUPPET_BASE = "/etc/puppet/"

tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py

@@ -854,13 +854,6 @@ 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(

tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py

@@ -588,8 +588,6 @@ class TestDeployUndercloud(TestPluginV1):
             os.path.join(tht_render,
                          'overcloud-resource-registry-puppet.yaml'),
             os.path.join(tht_render, 'passwords.yaml'),
-            os.path.join(tht_render,
-                         'environments/deployed-server-noop-ctlplane.yaml'),
             os.path.join(tht_render,
                          'tripleoclient-hosts-portmaps.yaml'),
             'hiera_or.yaml',

tripleoclient/v1/overcloud_deploy.py

@@ -266,11 +266,6 @@ class DeployOvercloud(command.Command):
             parameters, new_tht_root, parsed_args.stack)
         created_env_files.extend(param_env)
 
-        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(
                 self._provision_networks(parsed_args, new_tht_root,

tripleoclient/v1/tripleo_deploy.py

@@ -337,9 +337,7 @@ class Deploy(command.Command):
             'ExternalNetCidr': '%s/%s' % (public_vip_addr, ip_nw.prefixlen),
             # This requires use of the
             # ../deployed-server/deployed-neutron-port.yaml resource in t-h-t
-            # We use this for the control plane VIP and also via
-            # the environments/deployed-server-noop-ctlplane.yaml
-            # for the server IP itself
+            # We use this for the control plane VIP and the server IP itself
             'DeployedServerPortMap': {
                 ('%s-ctlplane' % hostname): {
                     'fixed_ips': [{'ip_address': ip_addr}],
@@ -548,12 +546,6 @@ class Deploy(command.Command):
         )
         environments.append(pw_file)
 
-        # use deployed-server because we run os-collect-config locally
-        deployed_server_env = os.path.join(
-            self.tht_render, 'environments',
-            'deployed-server-noop-ctlplane.yaml')
-        environments.append(deployed_server_env)
-
         self.log.info(_("Deploying templates in the directory {0}").format(
             os.path.abspath(self.tht_render)))