diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-07-27 00:10:09 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-07-27 00:22:27 +0800 |
| commit | 5fe1676f720bb1330645b13e067fcd1e77806c2d (patch) | |
| tree | 29ba84a8d31567d67b1d1a724a4bf991efb3f319 | |
| parent | 27e7f4bc5d18191cf59edd8b80ce142a3c3abfa0 (diff) | |
| download | kolla-5fe1676f720bb1330645b13e067fcd1e77806c2d.tar.gz kolla-5fe1676f720bb1330645b13e067fcd1e77806c2d.zip | |
Use the node_custom_config variable in the config.yml file
Fixed the ceilometer and neutron lbaas agent.
TrivialFix
Change-Id: Ie06826eb358e1a6487f96a978d8f191d79a0e054
| -rw-r--r-- | ansible/roles/ceilometer/tasks/config.yml | 10 | ||||
| -rw-r--r-- | 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 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" |