X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=docker%2Fservices%2Fgnocchi-statsd.yaml;h=0ebc83f6ce1382aa9c239b7e4a4f97bf9a352224;hb=73616922e481b66fc2bfff145d7c1130ce1a6552;hp=fea6b4b1cbccbdabc2cf9065695ef549732878ce;hpb=baf6eee5016fac7004a7b8be6f78d4505f347aeb;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/gnocchi-statsd.yaml b/docker/services/gnocchi-statsd.yaml
index fea6b4b1..0ebc83f6 100644
--- a/docker/services/gnocchi-statsd.yaml
+++ b/docker/services/gnocchi-statsd.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Gnocchi Statsd service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerGnocchiStatsdImage:
     description: image
-    default: 'centos-binary-gnocchi-statsd:latest'
     type: string
   DockerGnocchiConfigImage:
     description: The container image to use for the gnocchi config_volume
-    default: 'centos-binary-gnocchi-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -48,6 +42,9 @@ resources:
   ContainersCommon:
     type: ./containers-common.yaml
 
+  MySQLClient:
+    type: ../../puppet/services/database/mysql-client.yaml
+
   GnocchiStatsdBase:
     type: ../../puppet/services/gnocchi-statsd.yaml
     properties:
@@ -64,18 +61,20 @@ outputs:
     value:
       service_name: {get_attr: [GnocchiStatsdBase, role_data, service_name]}
       config_settings: {get_attr: [GnocchiStatsdBase, role_data, config_settings]}
+      logging_source: {get_attr: [GnocchiStatsdBase, role_data, logging_source]}
+      logging_groups: {get_attr: [GnocchiStatsdBase, role_data, logging_groups]}
       step_config: &step_config
-        get_attr: [GnocchiStatsdBase, role_data, step_config]
+        list_join:
+          - "\n"
+          - - {get_attr: [GnocchiStatsdBase, role_data, step_config]}
+            - {get_attr: [MySQLClient, role_data, step_config]}
       service_config_settings: {get_attr: [GnocchiStatsdBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: gnocchi
         puppet_tags: gnocchi_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiConfigImage} ]
+        config_image: {get_param: DockerGnocchiConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/gnocchi_statsd.json:
           command: /usr/bin/gnocchi-statsd
@@ -84,17 +83,18 @@ outputs:
               dest: "/"
               merge: true
               preserve_properties: true
+            - source: "/var/lib/kolla/config_files/src-ceph/"
+              dest: "/etc/ceph/"
+              merge: true
+              preserve_properties: true
           permissions:
             - path: /var/log/gnocchi
               owner: gnocchi:gnocchi
               recurse: true
       docker_config:
-        step_4:
+        step_5:
           gnocchi_statsd:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiStatsdImage} ]
+            image: {get_param: DockerGnocchiStatsdImage}
             net: host
             privileged: false
             restart: always
@@ -105,6 +105,7 @@ outputs:
                   - /var/lib/kolla/config_files/gnocchi_statsd.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/gnocchi/:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/gnocchi:/var/log/gnocchi
+                  - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
@@ -112,6 +113,10 @@ outputs:
           file:
             path: /var/log/containers/gnocchi
             state: directory
+        - name: ensure ceph configurations exist
+          file:
+            path: /etc/ceph
+            state: directory
       upgrade_tasks:
         - name: Stop and disable openstack-gnocchi-statsd service
           tags: step2