Revert "Use httpd in Zaqar docker service"

[apex-tripleo-heat-templates.git] / docker / services / gnocchi-metricd.yaml

diff --git a/docker/services/gnocchi-metricd.yaml b/docker/services/gnocchi-metricd.yaml
index 6437e94..78494d6 100644 (file)
--- a/docker/services/gnocchi-metricd.yaml
+++ b/docker/services/gnocchi-metricd.yaml
@@ -55,13 +55,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiMetricdImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/gnocchi-metricd.json:
-           command: /usr/bin/gnocchi-metricd
-           config_files:
-           - dest: /etc/gnocchi/gnocchi.conf
-             owner: gnocchi
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/gnocchi/gnocchi.conf
+        /var/lib/kolla/config_files/gnocchi-metricd.json:
+          command: /usr/bin/gnocchi-metricd
       docker_config:
         step_4:
           gnocchi_metricd:
@@ -71,8 +66,12 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/gnocchi-metricd.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/gnocchi/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      upgrade_tasks:
+        - name: Stop and disable openstack-gnocchi-metricd service
+          tags: step2
+          service: name=openstack-gnocchi-metricd.service state=stopped enabled=no