From 991695a272a56662e87c62c9be27f65688c063eb Mon Sep 17 00:00:00 2001
From: Bertrand Lallau <bertrand.lallau@thalesgroup.com>
Date: Thu, 15 Jun 2017 17:00:26 +0200
Subject: [PATCH] Simplify condition check on standalone services

Condition check are already performed here:
https://github.com/openstack/kolla-ansible/blob/master/ansible/site.yml
In order to simplify codebase, these checks can be removed for
standalone services.

Change-Id: Ib9842cd5363a1c7e56234a5e91dc264f89e2838f
---
 ansible/roles/grafana/tasks/deploy.yml     | 3 ---
 ansible/roles/keystone/tasks/deploy.yml    | 4 ----
 ansible/roles/mongodb/tasks/deploy.yml     | 3 ---
 ansible/roles/panko/tasks/deploy.yml       | 3 ---
 ansible/roles/searchlight/tasks/deploy.yml | 3 ---
 5 files changed, 16 deletions(-)

diff --git a/ansible/roles/grafana/tasks/deploy.yml b/ansible/roles/grafana/tasks/deploy.yml
index c12e50dcef..8dee54b5a9 100644
--- a/ansible/roles/grafana/tasks/deploy.yml
+++ b/ansible/roles/grafana/tasks/deploy.yml
@@ -1,12 +1,9 @@
 ---
 - include: config.yml
-  when: inventory_hostname in groups['grafana']
 
 - include: bootstrap.yml
-  when: inventory_hostname in groups['grafana']
 
 - name: Flush handlers
   meta: flush_handlers
 
 - include: post_config.yml
-  when: inventory_hostname in groups['grafana']
diff --git a/ansible/roles/keystone/tasks/deploy.yml b/ansible/roles/keystone/tasks/deploy.yml
index 95151c5dde..a730c46f35 100644
--- a/ansible/roles/keystone/tasks/deploy.yml
+++ b/ansible/roles/keystone/tasks/deploy.yml
@@ -1,19 +1,15 @@
 ---
 - include: config.yml
-  when: inventory_hostname in groups['keystone']
 
 - include: bootstrap.yml
-  when: inventory_hostname in groups['keystone']
 
 - name: Flush handlers
   meta: flush_handlers
 
 - include: init_fernet.yml
   when:
-    - inventory_hostname in groups['keystone']
     - keystone_token_provider == 'fernet'
 
 - include: register.yml
-  when: inventory_hostname in groups['keystone']
 
 - include: check.yml
diff --git a/ansible/roles/mongodb/tasks/deploy.yml b/ansible/roles/mongodb/tasks/deploy.yml
index fd4ed25937..98daa4021c 100644
--- a/ansible/roles/mongodb/tasks/deploy.yml
+++ b/ansible/roles/mongodb/tasks/deploy.yml
@@ -1,9 +1,6 @@
 ---
 - include: config.yml
-  when: inventory_hostname in groups['mongodb']
 
 - include: bootstrap.yml
-  when: inventory_hostname in groups['mongodb']
 
 - include: start.yml
-  when: inventory_hostname in groups['mongodb']
diff --git a/ansible/roles/panko/tasks/deploy.yml b/ansible/roles/panko/tasks/deploy.yml
index 933bd9459d..864362ba5f 100644
--- a/ansible/roles/panko/tasks/deploy.yml
+++ b/ansible/roles/panko/tasks/deploy.yml
@@ -1,12 +1,9 @@
 ---
 - include: register.yml
-  when: inventory_hostname in groups['panko-api']
 
 - include: config.yml
-  when: inventory_hostname in groups['panko-api']
 
 - include: bootstrap.yml
-  when: inventory_hostname in groups['panko-api']
 
 - name: Flush handlers
   meta: flush_handlers
diff --git a/ansible/roles/searchlight/tasks/deploy.yml b/ansible/roles/searchlight/tasks/deploy.yml
index 6c0058ec88..864362ba5f 100644
--- a/ansible/roles/searchlight/tasks/deploy.yml
+++ b/ansible/roles/searchlight/tasks/deploy.yml
@@ -1,12 +1,9 @@
 ---
 - include: register.yml
-  when: inventory_hostname in groups['searchlight']
 
 - include: config.yml
-  when: inventory_hostname in groups['searchlight']
 
 - include: bootstrap.yml
-  when: inventory_hostname in groups['searchlight']
 
 - name: Flush handlers
   meta: flush_handlers
-- 
GitLab