From 9cde33a3b1a261009b85c8adeece5a11aab80ae1 Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Fri, 2 Sep 2016 09:09:31 +0000 Subject: [PATCH] Revert "Set Deployment Parameters" This reverts commit 149bf36d7bf1a722f83edb0bf9a22891c4001d02 as it has broken: https://review.openstack.org/#/c/342261/ Change-Id: Ia3c0f3a85cfc029f1a017f4483417603ad6d51bd --- tripleo_common/actions/deployment.py | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/tripleo_common/actions/deployment.py b/tripleo_common/actions/deployment.py index 4609a6268..a247efd24 100644 --- a/tripleo_common/actions/deployment.py +++ b/tripleo_common/actions/deployment.py @@ -133,40 +133,17 @@ class DeployStackAction(templates.ProcessTemplatesAction): self.timeout_mins = timeout def run(self): - # check to see if the stack exists + processed_data = super(DeployStackAction, self).run() heat = self._get_orchestration_client() try: stack = heat.stacks.get(self.container) except heat_exc.HTTPNotFound: stack = None - stack_is_new = stack is None - - # update StackAction, DeployIdentifier and UpdateIdentifier - wc = self._get_workflow_client() - wf_env = wc.environments.get(self.container) - - parameters = dict() - timestamp = int(time.time()) - parameters['DeployIdentifier'] = timestamp - parameters['UpdateIdentifier'] = '' - parameters['StackAction'] = 'CREATE' if stack_is_new else 'UPDATE' - - env_kwargs = { - 'name': wf_env.name, - 'variables': wf_env.variables.update( - {'parameter_defaults': parameters} - ) - } - # store params changes back to db before call to process templates - wc.environments.update(**env_kwargs) - - # process all plan files and create or update a stack - processed_data = super(DeployStackAction, self).run() stack_args = processed_data.copy() stack_args['timeout_mins'] = self.timeout_mins - if stack_is_new: + if stack is None: LOG.info("Perfoming Heat stack create") return heat.stacks.create(**stack_args)