Browse Source

Merge "ceilometer_agent_notification: disable-panko.yaml" into stable/queens

tags/8.4.1
Zuul 2 months ago
parent
commit
1e87d16eed
1 changed files with 10 additions and 8 deletions
  1. 10
    8
      docker/services/ceilometer-agent-notification.yaml

+ 10
- 8
docker/services/ceilometer-agent-notification.yaml View File

@@ -83,17 +83,19 @@ outputs:
83 83
         /var/lib/kolla/config_files/ceilometer_agent_notification.json:
84 84
           command: /usr/bin/ceilometer-agent-notification --logfile /var/log/ceilometer/agent-notification.log
85 85
           config_files:
86
-            - source: "/var/lib/kolla/config_files/src/*"
87
-              dest: "/"
88
-              merge: true
89
-              preserve_properties: true
90
-            - if:
91
-                - ceilometer_enable_panko
92
-                - source: "/var/lib/kolla/config_files/src-panko/*"
86
+            list_concat:
87
+              - - source: "/var/lib/kolla/config_files/src/*"
93 88
                   dest: "/"
94 89
                   merge: true
95 90
                   preserve_properties: true
96
-                - ''
91
+              - if:
92
+                  - ceilometer_enable_panko
93
+                  - - source: "/var/lib/kolla/config_files/src-panko/*"
94
+                      dest: "/"
95
+                      merge: true
96
+                      preserve_properties: true
97
+                  - null
98
+
97 99
           permissions:
98 100
             - path: /etc/panko
99 101
               owner: root:ceilometer

Loading…
Cancel
Save