From 4fe38aadb1e05064cafbe7d7a786a0164207873c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= <cjeanner@redhat.com>
Date: Wed, 12 Aug 2020 07:54:30 +0200
Subject: [PATCH] Allows to use custom role name for validations

The tripleo-ansible-inventory script uses the role names in order to
group the different hosts.

Since we can use custom roles, the fixed "Controller" and others aren't
relevant in such cases.

Ansible allows to use parameter for the "hosts" value in playbooks,
allowing us to call the validations using this command:

openstack tripleo validator run --validation haproxy \
  --extra-vars '{"controller_rolename": "MyCustomController"}'

(or use the --extra-vars-file in order to avoid in-line JSON)

This patch also correct a non-existent group call, Database. The closest
we have is the "mysql" group in the inventory - let's reflect it in
order to avoid useless warning(s).

Change-Id: I3bec039283fe5df56771d84fff5bd5940fd149d8
(cherry picked from commit ec0465e481234da62d1ba673b4432e44c930f630)
(cherry picked from commit 088c4a1301ea53df1ed1a99ffbca384cbeef531d)
---
 playbooks/controller-token.yaml        | 4 +++-
 playbooks/controller-ulimits.yaml      | 2 +-
 playbooks/haproxy.yaml                 | 2 +-
 playbooks/mysql-open-files-limit.yaml  | 4 +++-
 playbooks/neutron-sanity-check.yaml    | 2 +-
 playbooks/nova-event-callback.yaml     | 2 +-
 playbooks/ovs-dpdk-pmd-cpus-check.yaml | 2 +-
 playbooks/pacemaker-status.yaml        | 2 +-
 playbooks/rabbitmq-limits.yaml         | 2 +-
 playbooks/stonith-exists.yaml          | 2 +-
 10 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/playbooks/controller-token.yaml b/playbooks/controller-token.yaml
index 67cd5c3cc..25161ccac 100644
--- a/playbooks/controller-token.yaml
+++ b/playbooks/controller-token.yaml
@@ -1,5 +1,7 @@
 ---
-- hosts: undercloud, Controller
+- hosts:
+    - undercloud
+    - "{{ controller_rolename | default('Controller') }}"
   vars:
     metadata:
       name: Verify that keystone admin token is disabled
diff --git a/playbooks/controller-ulimits.yaml b/playbooks/controller-ulimits.yaml
index f64ef59de..d1c592d1a 100644
--- a/playbooks/controller-ulimits.yaml
+++ b/playbooks/controller-ulimits.yaml
@@ -1,5 +1,5 @@
 ---
-- hosts: Controller
+- hosts: "{{ controller_rolename | default('Controller') }}"
   vars:
     metadata:
       name: Check controller ulimits
diff --git a/playbooks/haproxy.yaml b/playbooks/haproxy.yaml
index b746bd7ae..08b008927 100644
--- a/playbooks/haproxy.yaml
+++ b/playbooks/haproxy.yaml
@@ -1,5 +1,5 @@
 ---
-- hosts: Controller
+- hosts: "{{ controller_rolename | default('Controller') }}"
   vars:
     metadata:
       name: HAProxy configuration
diff --git a/playbooks/mysql-open-files-limit.yaml b/playbooks/mysql-open-files-limit.yaml
index d45f2f189..a815624ed 100644
--- a/playbooks/mysql-open-files-limit.yaml
+++ b/playbooks/mysql-open-files-limit.yaml
@@ -1,5 +1,7 @@
 ---
-- hosts: Controller, Database
+- hosts:
+    - "{{ controller_rolename | default('Controller') }}"
+    - mysql
   vars:
     metadata:
       name: MySQL Open Files Limit
diff --git a/playbooks/neutron-sanity-check.yaml b/playbooks/neutron-sanity-check.yaml
index 8625ca78c..5fe311fb9 100644
--- a/playbooks/neutron-sanity-check.yaml
+++ b/playbooks/neutron-sanity-check.yaml
@@ -1,5 +1,5 @@
 ---
-- hosts: Controller
+- hosts: "{{ controller_rolename | default('Controller') }}"
   gather_facts: false
   vars:
     metadata:
diff --git a/playbooks/nova-event-callback.yaml b/playbooks/nova-event-callback.yaml
index dc5d3cc50..e188beaf5 100644
--- a/playbooks/nova-event-callback.yaml
+++ b/playbooks/nova-event-callback.yaml
@@ -1,5 +1,5 @@
 ---
-- hosts: Controller
+- hosts: "{{ controller_rolename | default('Controller') }}"
   vars:
     metadata:
       name: Nova Event Callback Configuration Check
diff --git a/playbooks/ovs-dpdk-pmd-cpus-check.yaml b/playbooks/ovs-dpdk-pmd-cpus-check.yaml
index 755364df1..770ac23bc 100644
--- a/playbooks/ovs-dpdk-pmd-cpus-check.yaml
+++ b/playbooks/ovs-dpdk-pmd-cpus-check.yaml
@@ -1,5 +1,5 @@
 ---
-- hosts: ComputeOvsDpdk
+- hosts: "{{ compute_ovsdpdk_rolename | default('ComputeOvsDpdk') }}"
   vars:
     metadata:
       name: Validates OVS DPDK PMD cores from all NUMA nodes.
diff --git a/playbooks/pacemaker-status.yaml b/playbooks/pacemaker-status.yaml
index 739dc6578..b0e84efa6 100644
--- a/playbooks/pacemaker-status.yaml
+++ b/playbooks/pacemaker-status.yaml
@@ -1,5 +1,5 @@
 ---
-- hosts: Controller
+- hosts: "{{ controller_rolename | default('Controller') }}"
   vars:
     metadata:
       name: Check the status of the pacemaker cluster
diff --git a/playbooks/rabbitmq-limits.yaml b/playbooks/rabbitmq-limits.yaml
index ce7d98630..74b90d10b 100644
--- a/playbooks/rabbitmq-limits.yaml
+++ b/playbooks/rabbitmq-limits.yaml
@@ -1,5 +1,5 @@
 ---
-- hosts: Controller
+- hosts: "{{ controller_rolename | default('Controller') }}"
   vars:
     metadata:
       name: Rabbitmq limits
diff --git a/playbooks/stonith-exists.yaml b/playbooks/stonith-exists.yaml
index 24c9b15f5..7cd1278b4 100644
--- a/playbooks/stonith-exists.yaml
+++ b/playbooks/stonith-exists.yaml
@@ -1,5 +1,5 @@
 ---
-- hosts: Controller
+- hosts: "{{ controller_rolename | default('Controller') }}"
   vars:
     metadata:
       name: Validate stonith devices