From 5729af8ab726f364301fd849208cdcf7c27976d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Fri, 14 Jun 2019 18:03:07 +0200
Subject: [PATCH] Do not create Keystone domain-specific config directory if
useless
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The task was duplicated below (and this other one is conditional).
Additionally fix related tasks names.
Change-Id: I76a6dd84e78277f87b04951eb4e75bbdfc1c38bf
Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
---
ansible/roles/keystone/tasks/config.yml | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/ansible/roles/keystone/tasks/config.yml b/ansible/roles/keystone/tasks/config.yml
index c1f6b3642c..cf3829f585 100644
--- a/ansible/roles/keystone/tasks/config.yml
+++ b/ansible/roles/keystone/tasks/config.yml
@@ -29,23 +29,11 @@
when:
- keystone_policy.results
-- name: Check if Keystone Domain specific settings enabled
+- name: Check if Keystone domain-specific config is supplied
local_action: stat path="{{ node_custom_config }}/keystone/domains"
run_once: True
register: keystone_domain_directory
-- name: Creating Keystone Domain directory
- vars:
- keystone: "{{ keystone_services.keystone }}"
- file:
- dest: "{{ node_config_directory }}/keystone/domains/"
- state: "directory"
- mode: "0770"
- become: true
- when:
- - inventory_hostname in groups[keystone.group]
- - keystone.enabled | bool
-
- name: Copying over config.json files for services
template:
src: "{{ item.key }}.json.j2"
@@ -85,7 +73,7 @@
- Restart keystone container
- Restart keystone-fernet container
-- name: Creating Keystone Domain directory
+- name: Create Keystone domain-specific config directory
vars:
keystone: "{{ keystone_services.keystone }}"
file: