From bdaa2021a67856987ee3397eb9e06c1289ba1a9e Mon Sep 17 00:00:00 2001 From: "wu.chunyang" Date: Fri, 10 Aug 2018 06:22:55 +0000 Subject: [PATCH] Monasca API uses new config file name fix monasca api warning,the new config file name is api.conf Change-Id: Iabfbeab45d4e16602781d5fdf1ff0b2b67168d77 Closes-Bug: #1784656 --- ansible/roles/monasca/tasks/config.yml | 2 +- .../templates/monasca-api/{api-config.conf.j2 => api.conf.j2} | 0 .../roles/monasca/templates/monasca-api/monasca-api.json.j2 | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename ansible/roles/monasca/templates/monasca-api/{api-config.conf.j2 => api.conf.j2} (100%) diff --git a/ansible/roles/monasca/tasks/config.yml b/ansible/roles/monasca/tasks/config.yml index aa81463bfb..454452270e 100644 --- a/ansible/roles/monasca/tasks/config.yml +++ b/ansible/roles/monasca/tasks/config.yml @@ -40,7 +40,7 @@ become: true register: monasca_api_confs with_items: - - api-config.conf + - api.conf - api-config.ini when: - inventory_hostname in groups[service['group']] diff --git a/ansible/roles/monasca/templates/monasca-api/api-config.conf.j2 b/ansible/roles/monasca/templates/monasca-api/api.conf.j2 similarity index 100% rename from ansible/roles/monasca/templates/monasca-api/api-config.conf.j2 rename to ansible/roles/monasca/templates/monasca-api/api.conf.j2 diff --git a/ansible/roles/monasca/templates/monasca-api/monasca-api.json.j2 b/ansible/roles/monasca/templates/monasca-api/monasca-api.json.j2 index 66dcce588a..0ccd4b3b11 100644 --- a/ansible/roles/monasca/templates/monasca-api/monasca-api.json.j2 +++ b/ansible/roles/monasca/templates/monasca-api/monasca-api.json.j2 @@ -4,8 +4,8 @@ "command": "/usr/sbin/{{ monasca_cmd }} -DFOREGROUND", "config_files": [ { - "source": "{{ container_config_directory }}/api-config.conf", - "dest": "/etc/monasca/api-config.conf", + "source": "{{ container_config_directory }}/api.conf", + "dest": "/etc/monasca/api.conf", "owner": "monasca", "perm": "0600" },