Merge "Consistency changes in configs"

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"

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"

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: