openstack/kolla-ansible
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2016-07-27 02:29:50 +00:00 committed by Gerrit Code Review
commit 02b2280323
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ansible/roles/ceilometer/tasks/config.yml
View File

@ -27,11 +27,11 @@
service_name: "{{ item }}" service_name: "{{ item }}"
sources: sources:
- "{{ role_path }}/templates/ceilometer.conf.j2" - "{{ role_path }}/templates/ceilometer.conf.j2"
- "/etc/kolla/config/global.conf" - "{{ node_custom_config }}/global.conf"
- "/etc/kolla/config/database.conf" - "{{ node_custom_config }}/database.conf"
- "/etc/kolla/config/messaging.conf" - "{{ node_custom_config }}/messaging.conf"
- "/etc/kolla/config/glance.conf" - "{{ node_custom_config }}/glance.conf"
- "/etc/kolla/config/glance/{{ item }}.conf" - "{{ node_custom_config }}/glance/{{ item }}.conf"
- "{{ node_custom_config }}/ceilometer/{{ item }}.conf" - "{{ node_custom_config }}/ceilometer/{{ item }}.conf"
- "{{ node_custom_config }}/ceilometer/{{ inventory_hostname }}/ceilometer.conf" - "{{ node_custom_config }}/ceilometer/{{ inventory_hostname }}/ceilometer.conf"
dest: "{{ node_config_directory }}/{{ item }}/ceilometer.conf" dest: "{{ node_config_directory }}/{{ item }}/ceilometer.conf"

2
ansible/roles/neutron/tasks/config.yml
View File

@ -136,7 +136,7 @@
service_name: "{{ item }}" service_name: "{{ item }}"
sources: sources:
- "{{ role_path }}/templates/lbaas_agent.ini.j2" - "{{ 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" dest: "{{ node_config_directory }}/{{ item }}/lbaas_agent.ini"
with_items: with_items:
- "neutron-lbaas-agent" - "neutron-lbaas-agent"