Merge "Remove ceilometer upgrade from other ceilometer containers"

[apex-tripleo-heat-templates.git] / docker / services / ceilometer-agent-notification.yaml

diff --git a/docker/services/ceilometer-agent-notification.yaml b/docker/services/ceilometer-agent-notification.yaml
index 79df330..b2e85bb 100644 (file)
--- a/docker/services/ceilometer-agent-notification.yaml
+++ b/docker/services/ceilometer-agent-notification.yaml
@@ -12,6 +12,10 @@ parameters:
     description: image
     default: 'centos-binary-ceilometer-notification:latest'
     type: string
+  DockerCeilometerConfigImage:
+    description: The container image to use for the ceilometer config_volume
+    default: 'centos-binary-ceilometer-central:latest'
+    type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -63,24 +67,27 @@ outputs:
         config_volume: ceilometer
         puppet_tags: ceilometer_config
         step_config: *step_config
-        config_image: &ceilometer_agent_notification_image
+        config_image:
           list_join:
             - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerCeilometerNotificationImage} ]
+            - [ {get_param: DockerNamespace}, {get_param: DockerCeilometerConfigImage} ]
       kolla_config:
-        /var/lib/kolla/config_files/ceilometer-agent-notification.json:
+        /var/lib/kolla/config_files/ceilometer_agent_notification.json:
           command: /usr/bin/ceilometer-agent-notification
       docker_config:
         step_3:
           ceilometer_init_log:
             start_order: 0
-            image: *ceilometer_agent_notification_image
+            image: &ceilometer_agent_notification_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerCeilometerNotificationImage} ]
             user: root
             command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']
             volumes:
               - /var/log/containers/ceilometer:/var/log/ceilometer
         step_4:
-          ceilometer_agent-notification:
+          ceilometer_agent_notification:
             image: *ceilometer_agent_notification_image
             net: host
             privileged: false
@@ -89,24 +96,10 @@ outputs:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
-                  - /var/lib/kolla/config_files/ceilometer-agent-notification.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/kolla/config_files/ceilometer_agent_notification.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/ceilometer/etc/ceilometer/:/etc/ceilometer/:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
-        step_5:
-          ceilometer_gnocchi_upgrade:
-            start_order: 1
-            image: *ceilometer_agent_notification_image
-            net: host
-            detach: false
-            privileged: false
-            volumes:
-              list_concat:
-                - {get_attr: [ContainersCommon, volumes]}
-                -
-                  - /var/lib/config-data/ceilometer/etc/ceilometer/:/etc/ceilometer/:ro
-                  - /var/log/containers/ceilometer:/var/log/ceilometer
-            command: ["/usr/bin/ceilometer-upgrade", "--skip-metering-database"]
       upgrade_tasks:
         - name: Stop and disable ceilometer agent notification service
           tags: step2