openstack/python-tripleoclient
Code Issues Proposed changes

Remove RHEL registration envrionment file from list

Browse Source 
The RHEL registration environment file doesn't actually get written to,
so we were passing an environment file with empty values that would
override any values passed on the command line. This removes that file
from the returned list of templates, allowing the passed-in values to
take over.

Change-Id: I0c14e279842d6e9c8ed540cb7605965b39a49eca
Closes-Bug: #1648238
This commit is contained in:
Brad P. Crochet
2016-12-07 16:51:39 -05:00
parent 53a8815414
commit e46cd7d0f3
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py
View File

@@ -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.'

6
tripleoclient/v1/overcloud_deploy.py
View File

@@ -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}