Merge "Add environment to preselect only VIP IP addresses"

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

diff --git a/docker/services/gnocchi-statsd.yaml b/docker/services/gnocchi-statsd.yaml
index 32c1652..40023a6 100644 (file)
--- a/docker/services/gnocchi-statsd.yaml
+++ b/docker/services/gnocchi-statsd.yaml
@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   GnocchiStatsdBase:
     type: ../../puppet/services/gnocchi-statsd.yaml
     properties:
@@ -55,13 +58,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiStatsdImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/gnocchi-statsd.json:
-           command: /usr/bin/gnocchi-statsd
-           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-statsd.json:
+          command: /usr/bin/gnocchi-statsd
       docker_config:
         step_4:
           gnocchi_statsd:
@@ -70,9 +68,16 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/gnocchi-statsd.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/gnocchi/:/var/lib/kolla/config_files/src:ro
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/kolla/config_files/gnocchi-statsd.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      upgrade_tasks:
+        - name: Stop and disable openstack-gnocchi-statsd service
+          tags: step2
+          service: name=openstack-gnocchi-statsd.service state=stopped enabled=no