From 28da853830f2107808b537167a95bd89acf2254e Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 15 Oct 2019 12:16:14 +0100
Subject: [PATCH] Fix CI failures

1. Fix yamllint errors in .yamllint file(!)

YAML lint is currently failling on its own configuration file,
.yamllint. This change fixes the issues.

2. Run bindep role in Zuul jobs

This fixes an issue where libffi is not available.

Change-Id: Ic08a8e53a6905a68f0fe26d4b28184e62a64324f
(cherry picked from commit e3e5f7f20f4b067142ffecacbe47789eed1d0e3b)
---
 .yamllint     | 7 ++++---
 tests/pre.yml | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.yamllint b/.yamllint
index 85528611eb..6e9f06eaa0 100644
--- a/.yamllint
+++ b/.yamllint
@@ -1,3 +1,4 @@
+---
 extends: default
 ignore: |
   .tox/
@@ -8,8 +9,8 @@ rules:
   braces:
     max-spaces-inside: 1
   comments:
-    # Ignore first space in comment because we set default options as:
-    #openstack_version: "pike"
     require-starting-space: true
+    # Ignore comment validation in globals.yml - we break the
+    # require-starting-space rule.
     ignore: |
-      etc/kolla/globals.yml
\ No newline at end of file
+      etc/kolla/globals.yml
diff --git a/tests/pre.yml b/tests/pre.yml
index cbad56d190..53f63088bf 100644
--- a/tests/pre.yml
+++ b/tests/pre.yml
@@ -2,6 +2,9 @@
 - hosts: all
   vars:
     logs_dir: "/tmp/logs"
+  roles:
+    - bindep
+    - multi-node-firewall
   tasks:
     - name: Install dbus for debian system
       apt: name=dbus
@@ -30,5 +33,3 @@
       hostname:
         name: "{{ inventory_hostname }}"
       become: true
-  roles:
-    - multi-node-firewall