diff --git a/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py b/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py index 91e200106..708f75adf 100644 --- a/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py +++ b/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py @@ -165,6 +165,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): 'DeployIdentifier': 123456789, 'UpdateIdentifier': '', 'StackAction': 'UPDATE', + 'DeployIdentifier': '', } def _custom_create_params_env(_self, parameters, tht_root, @@ -285,7 +286,8 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): 'OvercloudControlFlavor': 'oooq_control', 'OvercloudControllerFlavor': 'oooq_control', 'StackAction': 'CREATE', - 'UpdateIdentifier': ''}} + 'UpdateIdentifier': '', + 'DeployIdentifier': ''}} mock_rm = shutil.rmtree = mock.MagicMock() self.cmd.take_action(parsed_args) @@ -441,6 +443,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): 'DeployIdentifier': 123456789, 'UpdateIdentifier': '', 'StackAction': 'CREATE', + 'DeployIdentifier': '', } testcase = self @@ -577,7 +580,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): def _custom_create_params_env(_self, parameters, tht_root, container_name): - testcase.assertTrue('DeployIdentifier' not in parameters) + testcase.assertTrue(parameters['DeployIdentifier'] == '') parameter_defaults = {"parameter_defaults": parameters} return parameter_defaults @@ -1118,7 +1121,8 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): parameters_env = { 'parameter_defaults': { 'StackAction': 'UPDATE', - 'UpdateIdentifier': ''}} + 'UpdateIdentifier': '', + 'DeployIdentifier': ''}} reg_env = { 'parameter_defaults': { 'rhel_reg_activation_key': 'super-awesome-key', @@ -1572,6 +1576,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): 'UpdateIdentifier': '', 'StackAction': 'CREATE', 'NtpServer': 'ntp', + 'DeployIdentifier': '', } def _custom_create_params_env(_self, parameters, tht_root, diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py index 235c98c94..a6eb6bf4d 100644 --- a/tripleoclient/v1/overcloud_deploy.py +++ b/tripleoclient/v1/overcloud_deploy.py @@ -69,6 +69,10 @@ class DeployOvercloud(command.Command): stack_is_new = stack is None + # *Identifier will be update to timestamp value during the deploy + # workflow, but till then for all heat stack validations, we need + # and entry for starting the deploy action. + parameters['DeployIdentifier'] = '' parameters['UpdateIdentifier'] = '' parameters['StackAction'] = 'CREATE' if stack_is_new else 'UPDATE'