From 5b988c71d64d151434c0130757c121dd0373a5c4 Mon Sep 17 00:00:00 2001
From: Dougal Matthews <dougal@redhat.com>
Date: Fri, 8 Jun 2018 10:09:32 +0100
Subject: [PATCH] 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 b6c68814197ec18d3d489e0f0c49664f34f27296)
---
 ...kflow-with-custom-overcloud-names-35404ceae3ac380e.yaml | 7 +++++++
 workbooks/plan_management.yaml                             | 5 +++++
 2 files changed, 12 insertions(+)
 create mode 100644 releasenotes/notes/fix-update-roles-workflow-with-custom-overcloud-names-35404ceae3ac380e.yaml

diff --git a/releasenotes/notes/fix-update-roles-workflow-with-custom-overcloud-names-35404ceae3ac380e.yaml b/releasenotes/notes/fix-update-roles-workflow-with-custom-overcloud-names-35404ceae3ac380e.yaml
new file mode 100644
index 000000000..71bde81a8
--- /dev/null
+++ b/releasenotes/notes/fix-update-roles-workflow-with-custom-overcloud-names-35404ceae3ac380e.yaml
@@ -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.
diff --git a/workbooks/plan_management.yaml b/workbooks/plan_management.yaml
index 2a268fa01..237733a2f 100644
--- a/workbooks/plan_management.yaml
+++ b/workbooks/plan_management.yaml
@@ -998,6 +998,7 @@ workflows:
     description: Internal workflow for validating a network exists from a role
 
     input:
+      - container: overcloud
       - defined_networks
       - networks_in_roles
       - queue_name: tripleo
@@ -1084,6 +1085,7 @@ workflows:
       validate_roles_and_networks:
         workflow: _validate_networks_from_roles
         input:
+          container: <% $.container %>
           defined_networks: <% $.network_data.name %>
           networks_in_roles: <% $.networks_in_roles %>
           queue_name: <% $.queue_name %>
@@ -1189,6 +1191,9 @@ workflows:
     tasks:
       get_available_roles:
         workflow: list_available_roles
+        input:
+          container: <% $.container %>
+          queue_name: <% $.queue_name%>
         publish:
           available_roles: <% task().result.available_roles %>
         on-success: validate_input