aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-06 08:41:07 +0000
committerGerrit Code Review <review@openstack.org>2016-08-06 08:41:08 +0000
commitd692e4b6f9dfcf6cf77bf1f6de5678c036c9a257 (patch)
tree2792c00f947b4df62a5ea9818110cbbcdb1290c8
parent306bc101d1e0e9db8c3606fe9535b79ef862187a (diff)
parent1c0ba85d541abc77cce5eb1d8ae3ad2961ab95c2 (diff)
downloadkolla-d692e4b6f9dfcf6cf77bf1f6de5678c036c9a257.tar.gz
kolla-d692e4b6f9dfcf6cf77bf1f6de5678c036c9a257.zip
Merge "Replace keystone's wsgi config with custom config"
-rw-r--r--ansible/roles/keystone/tasks/config.yml6
1 files changed, 5 insertions, 1 deletions
diff --git a/ansible/roles/keystone/tasks/config.yml b/ansible/roles/keystone/tasks/config.yml
index 12c3f47eb..cfca7dbad 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"