aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjackning <ningyougang@navercorp.com>2016-06-22 05:50:15 -0400
committerChristian Berendt <berendt@betacloud-solutions.de>2016-08-08 23:45:03 +0000
commitd707c59b42378838507acef8c3ef4842dcc9271f (patch)
tree6082ce16e15d9b9c7c6539e24f44c8611e06bf97
parentaa5864fc409ac8ff27f0b380b3ba45a3de0d1b98 (diff)
downloadkolla-d707c59b42378838507acef8c3ef4842dcc9271f.tar.gz
kolla-d707c59b42378838507acef8c3ef4842dcc9271f.zip
Replace horizon default config with custom config
Ansible's template action supports replacing horizon default config with custom config, it should only add with_first_found param to config.yml to support this. Change-Id: I45b8eed5b8d6c4d42672d99e41bc4eff7023a26f Closes-Bug: #1570677
-rw-r--r--ansible/roles/horizon/tasks/config.yml16
1 files changed, 11 insertions, 5 deletions
diff --git a/ansible/roles/horizon/tasks/config.yml b/ansible/roles/horizon/tasks/config.yml
index d70d73adf..c361c8352 100644
--- a/ansible/roles/horizon/tasks/config.yml
+++ b/ansible/roles/horizon/tasks/config.yml
@@ -16,12 +16,18 @@
- name: Copying over horizon.conf
template:
- src: "{{ item }}.conf.j2"
- dest: "{{ node_config_directory }}/{{ item }}/{{ item }}.conf"
- with_items:
- - "horizon"
+ src: "{{ item }}"
+ dest: "{{ node_config_directory }}/horizon/horizon.conf"
+ with_first_found:
+ - "{{ node_custom_config }}/horizon/{{ inventory_hostname }}/horizon.conf"
+ - "{{ node_custom_config }}/horizon/horizon.conf"
+ - "horizon.conf.j2"
- name: Copying over local_settings
template:
- src: "local_settings.j2"
+ src: "{{ item }}"
dest: "{{ node_config_directory }}/horizon/local_settings"
+ with_first_found:
+ - "{{ node_custom_config }}/horizon/{{ inventory_hostname }}/local_settings"
+ - "{{ node_custom_config }}/horizon/local_settings"
+ - "local_settings.j2"