Code Review
/
salt-formulas
/
influxdb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (from parent 1:
bbcaadc
)
Optimize 'noservices' condition
author
Martin Polreich
<polreichmartin@gmail.com>
Mon, 12 Jun 2017 17:16:48 +0000
(19:16 +0200)
committer
Martin Polreich
<polreichmartin@gmail.com>
Mon, 12 Jun 2017 17:16:48 +0000
(19:16 +0200)
influxdb/server.sls
patch
|
blob
|
history
diff --git
a/influxdb/server.sls
b/influxdb/server.sls
index 4276a8e86de5d663ba455e497c8a37854e110751..0be829f7b1fb1cfe349cebe6a51c2670603b41d3 100644
(file)
--- a/
influxdb/server.sls
+++ b/
influxdb/server.sls
@@
-30,8
+30,6
@@
influxdb_default:
- require:
- pkg: influxdb_packages
- require:
- pkg: influxdb_packages
-{%- if not grains.get('noservices', False) %}
-
influxdb_service:
service.running:
- enable: true
influxdb_service:
service.running:
- enable: true
@@
-39,12
+37,13
@@
influxdb_service:
# This delay is needed before being able to send data to server to create
# users and databases.
- init_delay: 5
# This delay is needed before being able to send data to server to create
# users and databases.
- init_delay: 5
+ {%- if grains.get('noservices') %}
+ - onlyif: /bin/false
+ {%- endif %}
- watch:
- file: influxdb_config
- file: influxdb_default
- watch:
- file: influxdb_config
- file: influxdb_default
-{%- endif %}
-
{% set url_for_query = "http://{}:{}/query".format(server.http.bind.address, server.http.bind.port) %}
{% set admin_created = false %}
{% set url_for_query = "http://{}:{}/query".format(server.http.bind.address, server.http.bind.port) %}
{% set admin_created = false %}
@@
-54,10
+53,8
@@
influxdb_service:
influxdb_create_admin:
cmd.run:
- name: curl -f -S -POST "{{ url_for_query }}" {{ query_create_admin }} || curl -f -S -POST "{{ admin_url }}" {{ query_create_admin }}
influxdb_create_admin:
cmd.run:
- name: curl -f -S -POST "{{ url_for_query }}" {{ query_create_admin }} || curl -f -S -POST "{{ admin_url }}" {{ query_create_admin }}
- {%- if not grains.get('noservices', False) %}
- require:
- service: influxdb_service
- require:
- service: influxdb_service
- {%- endif %}
{% set url_for_query = admin_url %}
{% set admin_created = true %}
{%- endif %}
{% set url_for_query = admin_url %}
{% set admin_created = true %}
{%- endif %}