From d23a88d7e86a1a6e8b694943f7d24ccc78423401 Mon Sep 17 00:00:00 2001
From: ZijianGuo <guozijn@gmail.com>
Date: Sun, 23 Jun 2019 09:40:32 +0800
Subject: [PATCH] Add gnocchi extra volumes

In some cases, we can mount extra volumes for gnocchi to facilitate
integration.

Change-Id: Ife475ca7d0555562f6e3ef0867835d69d288c8c4
Signed-off-by: ZijianGuo <guozijn@gmail.com>
---
 ansible/roles/gnocchi/defaults/main.yml | 41 ++++++++++++++++---------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/ansible/roles/gnocchi/defaults/main.yml b/ansible/roles/gnocchi/defaults/main.yml
index ba4124e527..4646a708d4 100644
--- a/ansible/roles/gnocchi/defaults/main.yml
+++ b/ansible/roles/gnocchi/defaults/main.yml
@@ -7,11 +7,7 @@ gnocchi_services:
     group: gnocchi-api
     enabled: true
     image: "{{ gnocchi_api_image_full }}"
-    volumes:
-      - "{{ node_config_directory }}/gnocchi-api/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "{{ gnocchi_metric_datadir_volume }}:/var/lib/gnocchi/"
-      - "kolla_logs:/var/log/kolla/"
+    volumes: "{{ gnocchi_api_default_volumes + gnocchi_api_extra_volumes }}"
     dimensions: "{{ gnocchi_api_dimensions }}"
     haproxy:
       gnocchi_api:
@@ -29,22 +25,14 @@ gnocchi_services:
     group: gnocchi-metricd
     enabled: true
     image: "{{ gnocchi_metricd_image_full }}"
-    volumes:
-      - "{{ node_config_directory }}/gnocchi-metricd/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "{{ gnocchi_metric_datadir_volume }}:/var/lib/gnocchi/"
-      - "kolla_logs:/var/log/kolla/"
+    volumes: "{{ gnocchi_metricd_default_volumes + gnocchi_metricd_extra_volumes }}"
     dimensions: "{{ gnocchi_metricd_dimensions }}"
   gnocchi-statsd:
     container_name: gnocchi_statsd
     group: gnocchi-statsd
     enabled: true
     image: "{{ gnocchi_statsd_image_full }}"
-    volumes:
-      - "{{ node_config_directory }}/gnocchi-statsd/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "{{ gnocchi_metric_datadir_volume }}:/var/lib/gnocchi/"
-      - "kolla_logs:/var/log/kolla/"
+    volumes: "{{ gnocchi_statsd_default_volumes + gnocchi_statsd_extra_volumes }}"
     dimensions: "{{ gnocchi_statsd_dimensions }}"
 
 
@@ -107,6 +95,29 @@ gnocchi_api_dimensions: "{{ default_container_dimensions }}"
 gnocchi_metricd_dimensions: "{{ default_container_dimensions }}"
 gnocchi_statsd_dimensions: "{{ default_container_dimensions }}"
 
+gnocchi_api_default_volumes:
+  - "{{ node_config_directory }}/gnocchi-api/:{{ container_config_directory }}/:ro"
+  - "/etc/localtime:/etc/localtime:ro"
+  - "{{ gnocchi_metric_datadir_volume }}:/var/lib/gnocchi/"
+  - "kolla_logs:/var/log/kolla/"
+
+gnocchi_metricd_default_volumes:
+  - "{{ node_config_directory }}/gnocchi-metricd/:{{ container_config_directory }}/:ro"
+  - "/etc/localtime:/etc/localtime:ro"
+  - "{{ gnocchi_metric_datadir_volume }}:/var/lib/gnocchi/"
+  - "kolla_logs:/var/log/kolla/"
+
+gnocchi_statsd_default_volumes:
+  - "{{ node_config_directory }}/gnocchi-statsd/:{{ container_config_directory }}/:ro"
+  - "/etc/localtime:/etc/localtime:ro"
+  - "{{ gnocchi_metric_datadir_volume }}:/var/lib/gnocchi/"
+  - "kolla_logs:/var/log/kolla/"
+
+gnocchi_extra_volumes: "{{ default_extra_volumes }}"
+gnocchi_api_extra_volumes: "{{ gnocchi_extra_volumes }}"
+gnocchi_metricd_extra_volumes: "{{ gnocchi_extra_volumes }}"
+gnocchi_statsd_extra_volumes: "{{ gnocchi_extra_volumes }}"
+
 ####################
 # OpenStack
 ####################