From 2529d207ed2fbafcfb90da54c376491d1f1a30e3 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Sun, 10 Sep 2017 19:27:43 +0100
Subject: [PATCH] Fix some 'issues' raised by ansible-lint

---
 ansible/compute-node-flavors.yml                            | 3 ++-
 .../overcloud-introspection-rules-dell-lldp-workaround.yml  | 2 +-
 ansible/roles/bootstrap/tasks/main.yml                      | 3 ++-
 ansible/roles/ip-allocation/tasks/main.yml                  | 6 ++++--
 ansible/roles/kolla-ansible/tasks/install.yml               | 3 ++-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ansible/compute-node-flavors.yml b/ansible/compute-node-flavors.yml
index 49868998c..a77b1f3ac 100644
--- a/ansible/compute-node-flavors.yml
+++ b/ansible/compute-node-flavors.yml
@@ -78,7 +78,8 @@
            sort }}
 
     # Register the new flavors.
-    - include_role:
+    - name: Include the stackhpc.os-flavors role
+      include_role:
         role: stackhpc.os-flavors
         os_flavors_venv: "{{ venv }}"
         os_flavors_auth_type: "{{ openstack_auth_type }}"
diff --git a/ansible/overcloud-introspection-rules-dell-lldp-workaround.yml b/ansible/overcloud-introspection-rules-dell-lldp-workaround.yml
index cc792bd05..9866beead 100644
--- a/ansible/overcloud-introspection-rules-dell-lldp-workaround.yml
+++ b/ansible/overcloud-introspection-rules-dell-lldp-workaround.yml
@@ -95,7 +95,7 @@
         - "{{ 'vlan' not in item.1.0 }}"
         # Ignore trunk links.
         - "{{ '-trunk' not in item.1.1.description }}"
-  
+
   roles:
     - role: ironic-inspector-rules
       ironic_inspector_venv: "{{ virtualenv_path }}/shade"
diff --git a/ansible/roles/bootstrap/tasks/main.yml b/ansible/roles/bootstrap/tasks/main.yml
index 6b8c67e0a..167908da5 100644
--- a/ansible/roles/bootstrap/tasks/main.yml
+++ b/ansible/roles/bootstrap/tasks/main.yml
@@ -1,5 +1,6 @@
 ---
-- include_vars: "{{ ansible_os_family }}.yml"
+- name: Include OS family-specific variables
+  include_vars: "{{ ansible_os_family }}.yml"
 
 - name: Ensure required packages are installed
   package:
diff --git a/ansible/roles/ip-allocation/tasks/main.yml b/ansible/roles/ip-allocation/tasks/main.yml
index 2707f6005..13f9912a3 100644
--- a/ansible/roles/ip-allocation/tasks/main.yml
+++ b/ansible/roles/ip-allocation/tasks/main.yml
@@ -7,10 +7,12 @@
   changed_when: False
   register: ip_allocation_os_release
 
-- include_vars: "RedHat.yml"
+- name: Include RedHat family-specific variables
+  include_vars: "RedHat.yml"
   when: ip_allocation_os_release.stdout in ['centos', 'fedora', 'rhel']
 
-- include_vars: "Debian.yml"
+- name: Include Debian family-specific variables
+  include_vars: "Debian.yml"
   when: ip_allocation_os_release.stdout in ['debian', 'ubuntu']
 
 # Note: Currently we install these using the system package manager rather than
diff --git a/ansible/roles/kolla-ansible/tasks/install.yml b/ansible/roles/kolla-ansible/tasks/install.yml
index 8b416bd36..dd0ee5aca 100644
--- a/ansible/roles/kolla-ansible/tasks/install.yml
+++ b/ansible/roles/kolla-ansible/tasks/install.yml
@@ -1,5 +1,6 @@
 ---
-- include_vars: "{{ ansible_os_family }}.yml"
+- name: Include OS family-specific variables
+  include_vars: "{{ ansible_os_family }}.yml"
 
 - name: Ensure EPEL repo is installed
   yum: