Ensure all role variables are passed correctly

Author: bradleyjones

roles/zuulnodepool/defaults/main.yaml

@@ -9,7 +9,4 @@ ci_roles:
   - name: ansible-role-zuul
     repo: https://github.com/openstack/ansible-role-zuul
 nodepool_install_method: git
-zuul_file_main_yaml_src: files/main.yaml
-zuul_file_zuul_conf_src: templates/zuul.conf
-nodepool_file_nodepool_yaml_src: files/nodepool.yaml
 nodepool_file_nodepool_launcher_service_config_src: files/nodepool-enable-webapp.conf

roles/zuulnodepool/tasks/main.yaml

@@ -16,6 +16,9 @@
   vars:
     nodepool_task_manager:
       - pre
+    nodepool_install_method: "{{ nodepool_install_method }}"
+    nodepool_file_nodepool_yaml_src: "{{ nodepool_file_nodepool_yaml_src }}"
+    nodepool_file_nodepool_launcher_service_config_src: "{{ nodepool_file_nodepool_launcher_service_config_src}}"
 
 - name: Allow passwordless sudo for nodepool
   lineinfile:
@@ -43,6 +46,9 @@
 - include_role:
     name: "{{item.name}}"
   with_items: "{{ ci_roles }}"
+  vars:
+    nodepool_install_method: "{{ nodepool_install_method }}"
+    nodepool_file_nodepool_launcher_service_config_src: "{{ nodepool_file_nodepool_launcher_service_config_src}}"
 
 - name: Create zuul.conf
   template: