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"