diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-09-26 10:46:16 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-09-27 15:03:07 +0000 |
| commit | 87f019481ebd54adf65e3d7e97330ee67ab28af9 (patch) | |
| tree | 0523bd1244f4848f079fed180e7ce2e78401da66 | |
| parent | c4fa05115c5a5723038b298bc85f89d6efd5b886 (diff) | |
| download | kolla-87f019481ebd54adf65e3d7e97330ee67ab28af9.tar.gz kolla-87f019481ebd54adf65e3d7e97330ee67ab28af9.zip | |
Rename the gnocchi api-paste filename
* Rename gnocchi-api-paste.ini to api-paste which is used in gnocchi
* Copy api-paste.ini to /etc/gnocchi in container
TrivialFix
Change-Id: I0ea5d947f3a4323e641a041fb190cae3031d36b2
| -rw-r--r-- | ansible/roles/gnocchi/tasks/config.yml | 10 | ||||
| -rw-r--r-- | ansible/roles/gnocchi/templates/api-paste.ini.j2 (renamed from ansible/roles/gnocchi/templates/gnocchi-api-paste.ini.j2) | 0 | ||||
| -rw-r--r-- | ansible/roles/gnocchi/templates/gnocchi-api.json.j2 | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/ansible/roles/gnocchi/tasks/config.yml b/ansible/roles/gnocchi/tasks/config.yml index 7baa626d3..2e7a75a8a 100644 --- a/ansible/roles/gnocchi/tasks/config.yml +++ b/ansible/roles/gnocchi/tasks/config.yml @@ -18,13 +18,13 @@ - "gnocchi-metricd" - "gnocchi-statsd" -- name: Copying over gnocchi-api-paste.ini +- name: Copying over api-paste.ini merge_configs: sources: - - "{{ role_path }}/templates/gnocchi-api-paste.ini.j2" - - "{{ node_custom_config }}/gnocchi/gnocchi-api-paste.ini" - - "{{ node_custom_config }}/gnocchi/{{ inventory_hostname }}/gnocchi-api-paste.ini" - dest: "{{ node_config_directory }}/gnocchi-api/gnocchi-api-paste.ini" + - "{{ role_path }}/templates/api-paste.ini.j2" + - "{{ node_custom_config }}/gnocchi/api-paste.ini" + - "{{ node_custom_config }}/gnocchi/{{ inventory_hostname }}/api-paste.ini" + dest: "{{ node_config_directory }}/gnocchi-api/api-paste.ini" - name: Copying over gnocchi.conf merge_configs: diff --git a/ansible/roles/gnocchi/templates/gnocchi-api-paste.ini.j2 b/ansible/roles/gnocchi/templates/api-paste.ini.j2 index 22b8c44b0..22b8c44b0 100644 --- a/ansible/roles/gnocchi/templates/gnocchi-api-paste.ini.j2 +++ b/ansible/roles/gnocchi/templates/api-paste.ini.j2 diff --git a/ansible/roles/gnocchi/templates/gnocchi-api.json.j2 b/ansible/roles/gnocchi/templates/gnocchi-api.json.j2 index 318807a9f..2e5749f51 100644 --- a/ansible/roles/gnocchi/templates/gnocchi-api.json.j2 +++ b/ansible/roles/gnocchi/templates/gnocchi-api.json.j2 @@ -10,6 +10,12 @@ "perm": "0600" }, { + "source": "{{ container_config_directory }}/api-paste.ini", + "dest": "/etc/gnocchi/api-paste.ini", + "owner": "gnocchi", + "perm": "0600" + }, + { "source": "{{ container_config_directory }}/wsgi-gnocchi.conf", "dest": "/etc/{{ gnocchi_dir }}/wsgi-gnocchi.conf", "owner": "gnocchi", |