From 7adf9cfca71d1d15f9df084548eb187654bce7d8 Mon Sep 17 00:00:00 2001 From: Mehdi Abaakouk Date: Fri, 25 May 2018 15:53:08 +0200 Subject: [PATCH] gnocchi: add missing /var/lib/gnocchi When file driver is selected, Gnocchi write data into /var/lib/gnocchi bug the data are loss when the container is restarted. This changes adds the volumes to all Gnocchi containers, so file driver will work as expected across restart. Closes-bug: #1773376 Change-Id: I086af01fed4eed609ea6801c483d76c819398979 (cherry picked from commit 398bcc7f79a1adc6807bf35aec6f0ea5814fdc2c) --- docker/services/gnocchi-api.yaml | 8 ++++++++ docker/services/gnocchi-metricd.yaml | 1 + docker/services/gnocchi-statsd.yaml | 1 + 3 files changed, 10 insertions(+) diff --git a/docker/services/gnocchi-api.yaml b/docker/services/gnocchi-api.yaml index cdd225a59e..77053ee531 100644 --- a/docker/services/gnocchi-api.yaml +++ b/docker/services/gnocchi-api.yaml @@ -126,6 +126,12 @@ outputs: - /var/log/containers/gnocchi:/var/log/gnocchi - /var/log/containers/httpd/gnocchi-api:/var/log/httpd command: ['/bin/bash', '-c', 'chown -R gnocchi:gnocchi /var/log/gnocchi'] + gnocchi_init_lib: + image: *gnocchi_api_image + user: root + volumes: + - /var/lib/gnocchi:/var/lib/gnocchi:rw + command: ['/bin/bash', '-c', 'chown -R gnocchi:gnocchi /var/lib/gnocchi'] step_4: gnocchi_db_sync: image: *gnocchi_api_image @@ -139,6 +145,7 @@ outputs: - - /var/lib/kolla/config_files/gnocchi_db_sync.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/config-data/puppet-generated/gnocchi/:/var/lib/kolla/config_files/src:ro + - /var/lib/gnocchi:/var/lib/gnocchi:rw - /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 @@ -154,6 +161,7 @@ outputs: list_concat: - {get_attr: [ContainersCommon, volumes]} - + - /var/lib/gnocchi:/var/lib/gnocchi:rw - /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 diff --git a/docker/services/gnocchi-metricd.yaml b/docker/services/gnocchi-metricd.yaml index 321f5e1630..bbd59bffba 100644 --- a/docker/services/gnocchi-metricd.yaml +++ b/docker/services/gnocchi-metricd.yaml @@ -114,6 +114,7 @@ outputs: - - /var/lib/kolla/config_files/gnocchi_metricd.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/config-data/puppet-generated/gnocchi/:/var/lib/kolla/config_files/src:ro + - /var/lib/gnocchi:/var/lib/gnocchi:rw - /var/log/containers/gnocchi:/var/log/gnocchi - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro environment: diff --git a/docker/services/gnocchi-statsd.yaml b/docker/services/gnocchi-statsd.yaml index f8ddcb6d4c..1086dfaa6a 100644 --- a/docker/services/gnocchi-statsd.yaml +++ b/docker/services/gnocchi-statsd.yaml @@ -115,6 +115,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 + - /var/lib/gnocchi:/var/lib/gnocchi:rw - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS