X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fgnocchi-api.yaml;h=96f6ab985877565226c9661776124d1fadfaa4eb;hb=4290af63ca4d6d3d7080422979bcb5592b3160d2;hp=5129b89f5da4d1b9dbd611766ec1a6bc32453b26;hpb=7e4f7dd2b0324247bba8fd8da5f3becd20e8299f;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/gnocchi-api.yaml b/docker/services/gnocchi-api.yaml
index 5129b89f..96f6ab98 100644
--- a/docker/services/gnocchi-api.yaml
+++ b/docker/services/gnocchi-api.yaml
@@ -39,6 +39,10 @@ parameters:
   EnableInternalTLS:
     type: boolean
     default: false
+  NumberOfStorageSacks:
+    default: 128
+    description: Number of storage sacks to create.
+    type: number
 
 conditions:
 
@@ -67,6 +71,8 @@ outputs:
         map_merge:
           - get_attr: [GnocchiApiPuppetBase, role_data, config_settings]
           - apache::default_vhost: false
+      logging_source: {get_attr: [GnocchiApiPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [GnocchiApiPuppetBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [GnocchiApiPuppetBase, role_data, step_config]
       service_config_settings: {get_attr: [GnocchiApiPuppetBase, role_data, service_config_settings]}
@@ -84,6 +90,10 @@ 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
@@ -96,8 +106,9 @@ outputs:
             user: root
             volumes:
               - /var/log/containers/gnocchi:/var/log/gnocchi
-            command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R gnocchi:gnocchi /var/log/gnocchi']
-        step_3:
+              - /var/log/containers/httpd/gnocchi-api:/var/log/httpd
+            command: ['/bin/bash', '-c', 'chown -R gnocchi:gnocchi /var/log/gnocchi']
+        step_4:
           gnocchi_db_sync:
             image: *gnocchi_api_image
             net: host
@@ -108,10 +119,17 @@ outputs:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
+                  - /var/lib/config-data/gnocchi/etc/my.cnf.d/tripleo.cnf:/etc/my.cnf.d/tripleo.cnf:ro
                   - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
                   - /var/log/containers/gnocchi:/var/log/gnocchi
-            command: "/usr/bin/bootstrap_host_exec gnocchi_api su gnocchi -s /bin/bash -c '/usr/bin/gnocchi-upgrade --skip-storage'"
-        step_4:
+                  - /var/log/containers/httpd/gnocchi-api:/var/log/httpd
+                  - /etc/ceph:/etc/ceph:ro
+            command:
+              str_replace:
+                template: /usr/bin/bootstrap_host_exec gnocchi_api su gnocchi -s /bin/bash -c '/usr/bin/gnocchi-upgrade --sacks-number=SACK_NUM'
+                params:
+                  SACK_NUM: {get_param: NumberOfStorageSacks}
+        step_5:
           gnocchi_api:
             image: *gnocchi_api_image
             net: host
@@ -124,6 +142,8 @@ outputs:
                   - /var/lib/kolla/config_files/gnocchi_api.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
+                  - /var/log/containers/httpd/gnocchi-api:/var/log/httpd
+                  - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
                   -
                     if:
                       - internal_tls_enabled
@@ -139,7 +159,14 @@ outputs:
       host_prep_tasks:
         - name: create persistent logs directory
           file:
-            path: /var/log/containers/gnocchi
+            path: "{{ item }}"
+            state: directory
+          with_items:
+            - /var/log/containers/gnocchi
+            - /var/log/containers/httpd/gnocchi-api
+        - name: ensure ceph configurations exist
+          file:
+            path: /etc/ceph
             state: directory
       upgrade_tasks:
         - name: Stop and disable httpd service