diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-17 16:05:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-17 16:05:49 +0000 |
| commit | 08c7cc7b2d2e1d86cd6d9588114cea4f29e11a91 (patch) | |
| tree | 855c036efe939cf8c354ae35e8eecaae282d92a4 | |
| parent | b7d1d98668536fc33a0803b7f6abc0f3783484eb (diff) | |
| parent | d707c59b42378838507acef8c3ef4842dcc9271f (diff) | |
| download | kolla-08c7cc7b2d2e1d86cd6d9588114cea4f29e11a91.tar.gz kolla-08c7cc7b2d2e1d86cd6d9588114cea4f29e11a91.zip | |
Merge "Replace horizon default config with custom config"
| -rw-r--r-- | ansible/roles/horizon/tasks/config.yml | 16 |
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" |