From: Guillaume Thouvenin <gthouvenin@mirantis.com>
Date: Mon, 14 Nov 2016 10:53:10 +0000 (+0100)
Subject: Allow the configuration of meta and data directories
X-Git-Tag: 2016.12~1^2~6^2
X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Finfluxdb.git;a=commitdiff_plain;h=1091d4622bc857bd8aec6148a4f90be8f5c6fdec;hp=80579f6f80ebab5756c44097cac384f4f4465ac9

Allow the configuration of meta and data directories
---

diff --git a/README.rst b/README.rst
index 48a494f..23b12f0 100644
--- a/README.rst
+++ b/README.rst
@@ -40,6 +40,20 @@ Single-node influxdb, SSL for http frontend:
               key_file: /etc/influxdb/ssl/key.pem
               cert_file: /etc/influxdb/ssl/cert.pem
 
+Single-node influxdb where you specify paths for data and metastore directories. You
+need to ensure that directories exist:
+
+.. code-block:: yaml
+
+    influxdb:
+      server:
+        enabled: true
+        data:
+          dir: '/opt/influxdb/data'
+          wal_dir: '/opt/influxdb/wal'
+        meta:
+          dir: '/opt/influxdb/meta'
+
 Single-node influxdb with an admin user:
 
 .. code-block:: yaml
diff --git a/influxdb/files/influxdb.conf b/influxdb/files/influxdb.conf
index 2fad019..6cc6d02 100644
--- a/influxdb/files/influxdb.conf
+++ b/influxdb/files/influxdb.conf
@@ -24,7 +24,7 @@ reporting-disabled = false
 {%- if server.meta.enabled %}
 [meta]
   # Where the metadata/raft database is stored
-  dir = "/var/lib/influxdb/meta"
+  dir = "{{ server.meta.dir }}"
 
   retention-autocreate = true
 
@@ -57,10 +57,10 @@ reporting-disabled = false
   # Controls if this node holds time series data shards in the cluster
   enabled = true
 
-  dir = "/var/lib/influxdb/data"
+  dir = "{{ server.data.dir }}"
 
   # These are the WAL settings for the storage engine >= 0.9.3
-  wal-dir = "/var/lib/influxdb/wal"
+  wal-dir = "{{ server.data.wal_dir }}"
   wal-logging-enabled = true
   data-logging-enabled = true
 
diff --git a/influxdb/map.jinja b/influxdb/map.jinja
index 9cbdddc..89d1203 100644
--- a/influxdb/map.jinja
+++ b/influxdb/map.jinja
@@ -23,8 +23,11 @@ default:
       port: 8083
   data:
     enabled: true
+    dir: '/var/lib/influxdb/data'
+    wal_dir: '/var/lib/influxdb/wal'
   meta:
     enabled: true
+    dir: '/var/lib/influxdb/meta'
 {%- endload %}
 
 {%- set server = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('influxdb:server')) %}