From e3e5f7f20f4b067142ffecacbe47789eed1d0e3b 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
---
 .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 c5a1ebf174..772f4f0714 100644
--- a/tests/pre.yml
+++ b/tests/pre.yml
@@ -3,6 +3,9 @@
   any_errors_fatal: true
   vars:
     logs_dir: "/tmp/logs"
+  roles:
+    - bindep
+    - multi-node-firewall
   tasks:
     # We have had cases where the nodepool private IP address is not assigned,
     # which causes hard to diagnose errors later on. Catch it early.
@@ -103,5 +106,3 @@
     - name: Ping across VXLAN
       command: ping -c1 {{ hostvars[item].api_interface_address }}
       with_inventory_hostnames: all
-  roles:
-    - multi-node-firewall