diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-21 16:38:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-21 16:38:17 +0000 |
| commit | 717429bb22a8bdd15ca87a0efa438604c172f4c5 (patch) | |
| tree | 1d7a68a6bc5f1c15420570b77531ee7c2b514372 /ansible | |
| parent | 90946af8658535ac9a739f89fb18109a897cd1f2 (diff) | |
| parent | 4e30d0f4051ac5e373a862e7b8ecca05bfd86b60 (diff) | |
| download | kolla-717429bb22a8bdd15ca87a0efa438604c172f4c5.tar.gz kolla-717429bb22a8bdd15ca87a0efa438604c172f4c5.zip | |
Merge "Allow a custom keepalived configuration file"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/haproxy/tasks/config.yml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ansible/roles/haproxy/tasks/config.yml b/ansible/roles/haproxy/tasks/config.yml index 50d324671..1b1fae029 100644 --- a/ansible/roles/haproxy/tasks/config.yml +++ b/ansible/roles/haproxy/tasks/config.yml @@ -32,10 +32,12 @@ - name: Copying over keepalived.conf template: - src: "{{ item }}.conf.j2" - dest: "{{ node_config_directory }}/{{ item }}/{{ item }}.conf" - with_items: - - "keepalived" + src: "{{ item }}" + dest: "{{ node_config_directory }}/keepalived/keepalived.conf" + with_first_found: + - "{{ node_custom_config }}/keepalived/{{ inventory_hostname }}/keepalived.conf" + - "{{ node_custom_config }}/keepalived/keepalived.conf" + - "keepalived.conf.j2" - name: Copying over haproxy.pem copy: |