From 791bf3d5fa47729604eda9d6318c031c0b612a1a Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Fri, 20 Oct 2017 15:50:48 +0800 Subject: [PATCH] Remove test variable for service_name in panko.conf file panko.conf depends on "service_name" variable, but when generating panko.conf in ceilometer, this variable is not set. Panko is a single process service, no need add such test. So simple remove the if clause. Change-Id: I5ba41046e35cd3fa00b8c22e1b4435acfaff5279 Closes-Bug: #1725159 --- ansible/roles/panko/tasks/config.yml | 2 -- ansible/roles/panko/templates/panko.conf.j2 | 2 -- 2 files changed, 4 deletions(-) diff --git a/ansible/roles/panko/tasks/config.yml b/ansible/roles/panko/tasks/config.yml index 581f85e257..6cfca51f63 100644 --- a/ansible/roles/panko/tasks/config.yml +++ b/ansible/roles/panko/tasks/config.yml @@ -22,8 +22,6 @@ - Restart panko-api container - name: Copying over panko.conf - vars: - service_name: "{{ item.key }}" merge_configs: sources: - "{{ role_path }}/templates/panko.conf.j2" diff --git a/ansible/roles/panko/templates/panko.conf.j2 b/ansible/roles/panko/templates/panko.conf.j2 index c923e32040..56a315cb3d 100644 --- a/ansible/roles/panko/templates/panko.conf.j2 +++ b/ansible/roles/panko/templates/panko.conf.j2 @@ -3,10 +3,8 @@ log_dir = /var/log/kolla/panko debug = {{ panko_logging_debug }} -{% if service_name == 'panko-api' %} # Force panko-api.log or will use app.wsgi log_file = /var/log/kolla/panko/panko-api.log -{% endif %} [database]