aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ansible/roles/ceilometer/tasks/config.yml10
-rw-r--r--ansible/roles/neutron/tasks/config.yml2
2 files changed, 6 insertions, 6 deletions
diff --git a/ansible/roles/ceilometer/tasks/config.yml b/ansible/roles/ceilometer/tasks/config.yml
index 97a537289..4ff57d384 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 9c285b50e..3495611aa 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"