From 5fe1676f720bb1330645b13e067fcd1e77806c2d Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Wed, 27 Jul 2016 00:10:09 +0800 Subject: [PATCH] Use the node_custom_config variable in the config.yml file Fixed the ceilometer and neutron lbaas agent. TrivialFix Change-Id: Ie06826eb358e1a6487f96a978d8f191d79a0e054 --- ansible/roles/ceilometer/tasks/config.yml | 10 +++++----- ansible/roles/neutron/tasks/config.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ansible/roles/ceilometer/tasks/config.yml b/ansible/roles/ceilometer/tasks/config.yml index 97a537289a..4ff57d384b 100644 --- a/ansible/roles/ceilometer/tasks/config.yml +++ b/ansible/roles/ceilometer/tasks/config.yml @@ -27,11 +27,11 @@ service_name: "{{ item }}" sources: - "{{ role_path }}/templates/ceilometer.conf.j2" - - "/etc/kolla/config/global.conf" - - "/etc/kolla/config/database.conf" - - "/etc/kolla/config/messaging.conf" - - "/etc/kolla/config/glance.conf" - - "/etc/kolla/config/glance/{{ item }}.conf" + - "{{ node_custom_config }}/global.conf" + - "{{ node_custom_config }}/database.conf" + - "{{ node_custom_config }}/messaging.conf" + - "{{ node_custom_config }}/glance.conf" + - "{{ node_custom_config }}/glance/{{ item }}.conf" - "{{ node_custom_config }}/ceilometer/{{ item }}.conf" - "{{ node_custom_config }}/ceilometer/{{ inventory_hostname }}/ceilometer.conf" dest: "{{ node_config_directory }}/{{ item }}/ceilometer.conf" diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml index 9c285b50e4..3495611aac 100644 --- a/ansible/roles/neutron/tasks/config.yml +++ b/ansible/roles/neutron/tasks/config.yml @@ -136,7 +136,7 @@ service_name: "{{ item }}" sources: - "{{ role_path }}/templates/lbaas_agent.ini.j2" - - "/etc/kolla/config/neutron/lbaas_agent.ini" + - "{{ node_custom_config }}/neutron/lbaas_agent.ini" dest: "{{ node_config_directory }}/{{ item }}/lbaas_agent.ini" with_items: - "neutron-lbaas-agent"