Merge "Fix bindep path"

playbooks/bindep-fallback/run.yaml

@@ -1,5 +1,9 @@
 - hosts: all
-  pre_tasks:
+  vars:
+    bindep_profile: test
+    # Define the global file so that no local file gets used.
+    bindep_file: /usr/local/bindep-fallback/bindep-fallback.txt
+  tasks:
     - name: Install requirements
       pip:
         chdir: "{{ zuul_work_dir }}"
@@ -12,9 +16,15 @@
         virtualenv: "{{ zuul_work_virtualenv }}"
         name: .
 
-  roles:
+    - name: Run bindep with the file
-    - role: bindep
+      command: "{{ zuul_work_virtualenv }}/bin/bindep -b -f {{ bindep_file }} {{ bindep_profile }}"
-      bindep_profile: test
+      register: _bindep_output
-      bindep_command: "{{ zuul_work_virtualenv }}/bin/bindep"
+      changed_when: false
-      # Define the global file so that no local file gets used.
+      failed_when: false
-      bindep_file: /usr/local/bindep-fallback/bindep-fallback.txt
+
+    - name: Install distro packages from bindep
+      package:
+        name: "{{ _bindep_output.stdout_lines }}"
+        state: present
+      become: yes
+      when: _bindep_output.stdout_lines