From c7197f9f36af586c66235dec8333446d60c7e13d Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 12 Sep 2017 16:55:54 +0100
Subject: [PATCH] Use vars: to pass variables to roles included via an
 include_role task

Passing variables inline with the role name appears not to work.
---
 ansible/compute-node-flavors.yml          | 3 ++-
 ansible/overcloud-introspection-rules.yml | 1 +
 ansible/overcloud-ipa-build.yml           | 1 +
 ansible/seed-ipa-build.yml                | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ansible/compute-node-flavors.yml b/ansible/compute-node-flavors.yml
index a77b1f3ac..3466693cd 100644
--- a/ansible/compute-node-flavors.yml
+++ b/ansible/compute-node-flavors.yml
@@ -80,7 +80,8 @@
     # Register the new flavors.
     - name: Include the stackhpc.os-flavors role
       include_role:
-        role: stackhpc.os-flavors
+        name: stackhpc.os-flavors
+      vars:
         os_flavors_venv: "{{ venv }}"
         os_flavors_auth_type: "{{ openstack_auth_type }}"
         os_flavors_auth: "{{ openstack_auth }}"
diff --git a/ansible/overcloud-introspection-rules.yml b/ansible/overcloud-introspection-rules.yml
index 6c07bef84..f97bb67c3 100644
--- a/ansible/overcloud-introspection-rules.yml
+++ b/ansible/overcloud-introspection-rules.yml
@@ -21,6 +21,7 @@
     - name: Ensure the openstack client is installed
       include_role:
         name: stackhpc.os-openstackclient
+      vars:
         os_openstackclient_venv: "{{ venv }}"
 
     - name: Retrieve the IPA kernel Glance image UUID
diff --git a/ansible/overcloud-ipa-build.yml b/ansible/overcloud-ipa-build.yml
index e69e230bb..a38b6440f 100644
--- a/ansible/overcloud-ipa-build.yml
+++ b/ansible/overcloud-ipa-build.yml
@@ -12,6 +12,7 @@
     - name: Ensure Ironic Python Agent images are built
       include_role:
         name: stackhpc.os-images
+      vars:
         os_images_venv: "{{ virtualenv_path }}/ipa-build-dib"
         os_images_cache: "{{ image_cache_path }}"
         os_images_common: ""
diff --git a/ansible/seed-ipa-build.yml b/ansible/seed-ipa-build.yml
index b50dcff2b..a43a81819 100644
--- a/ansible/seed-ipa-build.yml
+++ b/ansible/seed-ipa-build.yml
@@ -14,6 +14,7 @@
         - name: Ensure Ironic Python Agent images are built
           include_role:
             name: stackhpc.os-images
+          vars:
             os_images_venv: "{{ virtualenv_path }}/ipa-build-dib"
             os_images_cache: "{{ image_cache_path }}"
             os_images_common: ""