Pass container and queue_name inputs to the list_available_roles workflow
The tripleo.plan_management.v1.update_roles workflow didn't pass the plan
name (container name) or Zaqar queue name to the sub-workflow it triggered.
This caused the behaviour to be incorrect when using a name other than the
default. It now correctly passes on these parameters.
Change-Id: Ie0fccbdbfd97005dbc13ae6d1493b8274bb6254e
Closes-Bug: #1775791
(cherry picked from commit b6c6881419
)
This commit is contained in:
parent
726c603fb7
commit
5b988c71d6
|
@ -0,0 +1,7 @@
|
||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
The tripleo.plan_management.v1.update_roles workflow didn't pass the plan
|
||||||
|
name (container name) or Zaqar queue name to the sub-workflow it triggered.
|
||||||
|
This caused the behaviour to be incorrect when using a name other than the
|
||||||
|
default. It now correctly passes on these parameters.
|
|
@ -998,6 +998,7 @@ workflows:
|
||||||
description: Internal workflow for validating a network exists from a role
|
description: Internal workflow for validating a network exists from a role
|
||||||
|
|
||||||
input:
|
input:
|
||||||
|
- container: overcloud
|
||||||
- defined_networks
|
- defined_networks
|
||||||
- networks_in_roles
|
- networks_in_roles
|
||||||
- queue_name: tripleo
|
- queue_name: tripleo
|
||||||
|
@ -1084,6 +1085,7 @@ workflows:
|
||||||
validate_roles_and_networks:
|
validate_roles_and_networks:
|
||||||
workflow: _validate_networks_from_roles
|
workflow: _validate_networks_from_roles
|
||||||
input:
|
input:
|
||||||
|
container: <% $.container %>
|
||||||
defined_networks: <% $.network_data.name %>
|
defined_networks: <% $.network_data.name %>
|
||||||
networks_in_roles: <% $.networks_in_roles %>
|
networks_in_roles: <% $.networks_in_roles %>
|
||||||
queue_name: <% $.queue_name %>
|
queue_name: <% $.queue_name %>
|
||||||
|
@ -1189,6 +1191,9 @@ workflows:
|
||||||
tasks:
|
tasks:
|
||||||
get_available_roles:
|
get_available_roles:
|
||||||
workflow: list_available_roles
|
workflow: list_available_roles
|
||||||
|
input:
|
||||||
|
container: <% $.container %>
|
||||||
|
queue_name: <% $.queue_name%>
|
||||||
publish:
|
publish:
|
||||||
available_roles: <% task().result.available_roles %>
|
available_roles: <% task().result.available_roles %>
|
||||||
on-success: validate_input
|
on-success: validate_input
|
||||||
|
|
Loading…
Reference in New Issue