diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-19 15:45:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-19 15:45:57 +0000 |
| commit | 14c56d542f64392c68b3855ee4ec3be57008b481 (patch) | |
| tree | 2a944a5c1eeb54ca0f158d0fedec3ed697879939 | |
| parent | 36ebd7dc827f3696cac8b4677905a17e4b492f5e (diff) | |
| parent | 57fdb0ceed9efdf7cc3bd88aaa069b8c4c7a9077 (diff) | |
| download | kolla-14c56d542f64392c68b3855ee4ec3be57008b481.tar.gz kolla-14c56d542f64392c68b3855ee4ec3be57008b481.zip | |
Merge "Consistency changes in configs"
| -rw-r--r-- | ansible/roles/common/tasks/config.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/haproxy/tasks/config.yml | 12 | ||||
| -rw-r--r-- | ansible/roles/horizon/tasks/config.yml | 7 |
3 files changed, 17 insertions, 8 deletions
diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml index d9bc821f9..56ba9a9cc 100644 --- a/ansible/roles/common/tasks/config.yml +++ b/ansible/roles/common/tasks/config.yml @@ -16,5 +16,7 @@ - name: Copying over rsyslog.conf template: - src: "rsyslog.conf.j2" - dest: "{{ node_config_directory }}/rsyslog/rsyslog.conf" + src: "{{ item }}.conf.j2" + dest: "{{ node_config_directory }}/{{ item }}/{{ item }}.conf" + with_items: + - "rsyslog" diff --git a/ansible/roles/haproxy/tasks/config.yml b/ansible/roles/haproxy/tasks/config.yml index 9df07fd1e..2a9941ccc 100644 --- a/ansible/roles/haproxy/tasks/config.yml +++ b/ansible/roles/haproxy/tasks/config.yml @@ -22,10 +22,14 @@ - name: Copying over haproxy.cfg template: - src: "haproxy.cfg.j2" - dest: "{{ node_config_directory }}/haproxy/haproxy.cfg" + src: "{{ item }}.cfg.j2" + dest: "{{ node_config_directory }}/{{ item }}/{{ item }}.cfg" + with_items: + - "haproxy" - name: Copying over keepalived.conf template: - src: "keepalived.conf.j2" - dest: "{{ node_config_directory }}/keepalived/keepalived.conf" + src: "{{ item }}.conf.j2" + dest: "{{ node_config_directory }}/{{ item }}/{{ item }}.conf" + with_items: + - "keepalived" diff --git a/ansible/roles/horizon/tasks/config.yml b/ansible/roles/horizon/tasks/config.yml index 4018c439a..28ded6d71 100644 --- a/ansible/roles/horizon/tasks/config.yml +++ b/ansible/roles/horizon/tasks/config.yml @@ -16,8 +16,11 @@ - name: Copying over horizon.conf template: - src: "horizon.conf.j2" - dest: "{{ node_config_directory }}/horizon/horizon.conf" + src: "{{ item }}.conf.j2" + dest: "{{ node_config_directory }}/{{ item }}/{{ item }}.conf" + with_items: + - "horizon" + - name: Copying over local_settings template: |