diff --git a/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py b/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py index c1fbffbd2..f1633d715 100644 --- a/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py +++ b/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py @@ -844,9 +844,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): 'pre_deploy/rhel-registration/') calls = [ mock.call(env_path=tht_prefix + - 'rhel-registration-resource-registry.yaml'), - mock.call(env_path=tht_prefix + - 'environment-rhel-registration.yaml')] + 'rhel-registration-resource-registry.yaml'), ] mock_process_env.assert_has_calls(calls) @mock.patch('tripleoclient.tests.v1.overcloud_deploy.fakes.' diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py index 0f341b7c4..632771fee 100644 --- a/tripleoclient/v1/overcloud_deploy.py +++ b/tripleoclient/v1/overcloud_deploy.py @@ -115,10 +115,6 @@ class DeployOvercloud(command.Command): def _create_registration_env(self, args): tht_root = args.templates - env_file = os.path.join( - tht_root, - constants.RHEL_REGISTRATION_EXTRACONFIG_NAME, - 'environment-rhel-registration.yaml') registry = os.path.join( tht_root, constants.RHEL_REGISTRATION_EXTRACONFIG_NAME, @@ -128,7 +124,7 @@ class DeployOvercloud(command.Command): 'rhel_reg_force': args.reg_force, 'rhel_reg_sat_url': args.reg_sat_url, 'rhel_reg_activation_key': args.reg_activation_key} - return [registry, env_file], {"parameter_defaults": user_env} + return [registry], {"parameter_defaults": user_env} def _create_parameters_env(self, parameters): parameter_defaults = {"parameter_defaults": parameters}