From 57fdb0ceed9efdf7cc3bd88aaa069b8c4c7a9077 Mon Sep 17 00:00:00 2001
From: Maciej Szankin <maciej.szankin@intel.com>
Date: Tue, 19 Jan 2016 14:58:11 +0100
Subject: [PATCH] Consistency changes in configs
TrivialFix
Change-Id: Iafd92e4e962dec5a225582ff058ab3603e5a50bb
---
ansible/roles/common/tasks/config.yml | 6 ++++--
ansible/roles/haproxy/tasks/config.yml | 12 ++++++++----
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 d9bc821f98..56ba9a9cc5 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 9df07fd1ec..2a9941ccc8 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 4018c439a1..28ded6d71d 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: