openstack/python-tripleoclient
Code Issues Proposed changes

Composable role and service fails workflow

Browse Source 
When defining a resource_registry for a composable service, the workflow fails
because it validates before the user-environment is added.
This patch moves the workflow invocation after the creation of the user-
environment.
This is caused by https://review.openstack.org/#/c/511249/ which changes the
behaviour of the action in tripleo-common.

Change-Id: Idf17e3f817708d9e7dd7241063434ce56b6be052
Closes-Bug: 1743575
This commit is contained in:
Michael Henkel 2018-01-16 15:50:35 +01:00
parent 15ba4088e4
commit 7c0ad1df5e
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
releasenotes/notes/bug-1743575-dcacfa668eaf51a6.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
This patch fixes https://bugs.launchpad.net/tripleo/+bug/1743575
The bug prevents a successeful stack creation when using a custom role with
a composable service.

17
tripleoclient/v1/overcloud_deploy.py
View File

@ -319,14 +319,8 @@ class DeployOvercloud(command.Command):
path = path[1:] path = path[1:]
env['resource_registry'][name] = path env['resource_registry'][name] = path
# Parameters are removed from the environment and sent to the update # Parameters are removed from the environment
# parameters action, this stores them in the plan environment and params = env.pop('parameter_defaults', None)
# means the UI can find them.
if 'parameter_defaults' in env:
params = env.pop('parameter_defaults')
workflow_params.update_parameters(
self.workflow_client, container=container_name,
parameters=params)
contents = yaml.safe_dump(env, default_flow_style=False) contents = yaml.safe_dump(env, default_flow_style=False)
@ -348,6 +342,13 @@ class DeployOvercloud(command.Command):
self.object_client.put_object( self.object_client.put_object(
container_name, constants.PLAN_ENVIRONMENT, yaml_string) container_name, constants.PLAN_ENVIRONMENT, yaml_string)
# Parameters are sent to the update parameters action, this stores them
# in the plan environment and means the UI can find them.
if params:
workflow_params.update_parameters(
self.workflow_client, container=container_name,
parameters=params)
def _upload_missing_files(self, container_name, files_dict, tht_root): def _upload_missing_files(self, container_name, files_dict, tht_root):
"""Find the files referenced in custom environments and upload them """Find the files referenced in custom environments and upload them