From a6a76a7b74958b87f2fac308c1c7b1b4f168361b Mon Sep 17 00:00:00 2001
From: Bertrand Lallau <bertrand.lallau@thalesgroup.com>
Date: Thu, 13 Apr 2017 13:13:50 +0200
Subject: [PATCH] Fix Freezer service config override issue
Freezer service configuration can't be override has describe here:
https://github.com/openstack/kolla-ansible/blob/master/doc/advanced-configuration.rst#L161
Kolla-ansible should look for files in /etc/kolla/config/ but it doesn't
take config files into account. This patch fix it.
Change-Id: Ia7d8d0892d13ba9785951a7b1291abb868fc714b
Closes-Bug: #1682404
---
ansible/roles/freezer/tasks/config.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ansible/roles/freezer/tasks/config.yml b/ansible/roles/freezer/tasks/config.yml
index 1f3032c08..970e8715f 100644
--- a/ansible/roles/freezer/tasks/config.yml
+++ b/ansible/roles/freezer/tasks/config.yml
@@ -39,10 +39,10 @@
service_name: "{{ item.key }}"
sources:
- "{{ role_path }}/templates/freezer-api.conf.j2"
- - "{{ node_config_directory }}/global.conf"
- - "{{ node_config_directory }}/database.conf"
- - "{{ node_config_directory }}/messaging.conf"
- - "{{ node_config_directory }}/freezer.conf"
+ - "{{ node_custom_config }}/global.conf"
+ - "{{ node_custom_config }}/database.conf"
+ - "{{ node_custom_config }}/messaging.conf"
+ - "{{ node_custom_config }}/freezer.conf"
- "{{ node_custom_config }}/freezer/{{ item.key }}.conf"
- "{{ node_custom_config }}/freezer/{{ inventory_hostname }}/{{ item.key }}.conf"
dest: "{{ node_config_directory }}/{{ item.key }}/freezer-api.conf"
@@ -60,7 +60,7 @@
- name: Copying over existing policy.json
template:
- src: "{{ node_config_directory }}/freezer/policy.json"
+ src: "{{ node_custom_config }}/freezer/policy.json"
dest: "{{ node_config_directory }}/{{ item.key }}/policy.json"
register: freezer_policy_jsons
when:
--
GitLab