diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-27 02:29:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-27 02:29:50 +0000 |
| commit | 02b2280323df9e8076709c3b871d4108b9af8228 (patch) | |
| tree | a4457188041e338e6517e4ced1775cb367157fe6 | |
| parent | 4f3c213cbfcb2bc1097303e9a84c0e01f7676124 (diff) | |
| parent | 5fe1676f720bb1330645b13e067fcd1e77806c2d (diff) | |
| download | kolla-02b2280323df9e8076709c3b871d4108b9af8228.tar.gz kolla-02b2280323df9e8076709c3b871d4108b9af8228.zip | |
Merge "Use the node_custom_config variable in the config.yml file"
| -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" |