Merge "ceilometer_agent_notification: disable-panko.yaml"

deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml

@@ -94,17 +94,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