From 8fac4c4334ad2b2ef67040d053a58a9ba8857425 Mon Sep 17 00:00:00 2001 From: Nagasai Vinaykumar Kapalavai Date: Mon, 15 Apr 2019 11:24:15 -0400 Subject: [PATCH] ceilometer_agent_notification: disable-panko.yaml ceilometer-agent-notification.yaml updated the kolla_config section in template file to include nothing related to panko when disable-panko env file is passed. Closes-Bug: #1824840 Change-Id: I947f6a4c65a9ef6a9220a07098f4c91507711cf6 --- ...er-agent-notification-container-puppet.yaml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml index e0a4273b31..12ca412912 100644 --- a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml @@ -98,17 +98,19 @@ outputs: /var/lib/kolla/config_files/ceilometer_agent_notification.json: command: /usr/bin/ceilometer-agent-notification --logfile /var/log/ceilometer/agent-notification.log config_files: - - source: "/var/lib/kolla/config_files/src/*" - dest: "/" - merge: true - preserve_properties: true - - if: - - ceilometer_enable_panko - - source: "/var/lib/kolla/config_files/src-panko/*" + list_concat: + - - source: "/var/lib/kolla/config_files/src/*" dest: "/" merge: true preserve_properties: true - - '' + - if: + - ceilometer_enable_panko + - - source: "/var/lib/kolla/config_files/src-panko/*" + dest: "/" + merge: true + preserve_properties: true + - null + permissions: - path: /etc/panko owner: root:ceilometer