From 1c0ba85d541abc77cce5eb1d8ae3ad2961ab95c2 Mon Sep 17 00:00:00 2001
From: jackning <ningyougang@navercorp.com>
Date: Thu, 4 Aug 2016 03:41:40 -0400
Subject: [PATCH] Replace keystone's wsgi config with custom config

Ansible's template action supports replacing keystone's wsgi default
config with custom config, it should only add with_first_found param
to config.yml to support this.

Change-Id: Id66302802db9a57188067982ea697f16faa1d8eb
Closes-Bug: #1609655
---
 ansible/roles/keystone/tasks/config.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/keystone/tasks/config.yml b/ansible/roles/keystone/tasks/config.yml
index 12c3f47eb3..cfca7dbad1 100644
--- a/ansible/roles/keystone/tasks/config.yml
+++ b/ansible/roles/keystone/tasks/config.yml
@@ -62,5 +62,9 @@
 
 - name: Copying over wsgi-keystone.conf
   template:
-    src: "wsgi-keystone.conf.j2"
+    src: "{{ item }}"
     dest: "{{ node_config_directory }}/keystone/wsgi-keystone.conf"
+  with_first_found:
+    - "{{ node_custom_config }}/keystone/{{ inventory_hostname }}/wsgi-keystone.conf"
+    - "{{ node_custom_config }}/keystone/wsgi-keystone.conf"
+    - "wsgi-keystone.conf.j2"