X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Finfluxdb.git;a=blobdiff_plain;f=influxdb%2Fserver.sls;h=972dd28815d567bb352447fce5056038d29b1fb1;hp=30899fc28775e67db1e1f71244891bd329eb08af;hb=6fa2a21d70dd38844ac0c26f2e4ed797d14dc1fc;hpb=97e372ac40aa52635d23e85affdbc729d28a6380

diff --git a/influxdb/server.sls b/influxdb/server.sls
index 30899fc..972dd28 100644
--- a/influxdb/server.sls
+++ b/influxdb/server.sls
@@ -2,18 +2,30 @@
 
 {%- if server.enabled %}
 
+{%- if not server.container_mode %}
 influxdb_packages:
   pkg.installed:
   - names: {{ server.pkgs }}
+{%- endif %}
+
+{{ server.prefix_dir }}/etc/influxdb:
+  file.directory:
+    - user: root
+    - group: root
+    - mode: 755
+    - makedirs: True
 
 influxdb_config:
   file.managed:
-  - name: /etc/influxdb/influxdb.conf
+  - name: {{ server.prefix_dir }}/etc/influxdb/influxdb.conf
   - source: salt://influxdb/files/influxdb.conf
   - template: jinja
+{%- if not server.container_mode %}
   - require:
     - pkg: influxdb_packages
+{%- endif %}
 
+{%- if not server.container_mode %}
 influxdb_default:
   file.managed:
   - name: /etc/default/influxdb
@@ -21,6 +33,28 @@ influxdb_default:
   - template: jinja
   - require:
     - pkg: influxdb_packages
+{%- endif %}
+
+{{server.data.dir}}:
+  file.directory:
+    - makedirs: True
+    - mode: 755
+    - user: {{ server.service_user }}
+    - group: {{ server.service_group }}
+
+{{server.data.wal_dir}}:
+  file.directory:
+    - makedirs: True
+    - mode: 755
+    - user: {{ server.service_user }}
+    - group: {{ server.service_group }}
+
+{{server.meta.dir}}:
+  file.directory:
+    - makedirs: True
+    - mode: 755
+    - user: {{ server.service_user }}
+    - group: {{ server.service_group }}
 
 influxdb_service:
   service.running:
@@ -29,17 +63,19 @@ influxdb_service:
   # This delay is needed before being able to send data to server to create
   # users and databases.
   - init_delay: 5
-  {%- if grains.get('noservices') %}
+{%- if grains.get('noservices') or server.container_mode %}
   - onlyif: /bin/false
-  {%- endif %}
+{%- endif %}
   - watch:
     - file: influxdb_config
+{%- if not server.container_mode %}
     - file: influxdb_default
+{%- endif %}
 
 {% set url_for_query = "http://{}:{}/query".format(server.http.bind.address, server.http.bind.port) %}
 {% set admin_created = false %}
 
-{%- if server.admin.get('user', {}).get('enabled', False) %}
+{%- if not server.container_mode and server.admin.get('user', {}).get('enabled', False) %}
   {% set query_create_admin = "--data-urlencode \"q=CREATE USER {} WITH PASSWORD '{}' WITH ALL PRIVILEGES\"".format(server.admin.user.name, server.admin.user.password) %}
   {% set admin_url = "http://{}:{}/query?u={}&p={}".format(server.http.bind.address, server.http.bind.port, server.admin.user.name, server.admin.user.password) %}
 influxdb_create_admin: