Merge "Use the node_custom_config variable in the config.yml file"

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"

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"