Merge pull request #13 from Martin819/master
Simplify 'noservices' condition
diff --git a/etcd/files/systemd/etcd.service b/etcd/files/systemd/etcd.service
index 6414481..154e715 100644
--- a/etcd/files/systemd/etcd.service
+++ b/etcd/files/systemd/etcd.service
@@ -17,7 +17,7 @@
Restart=on-abnormal
#RestartSec=10s
LimitNOFILE=65536
+TimeoutSec=120
[Install]
WantedBy=multi-user.target
-Alias=etcd2.service
diff --git a/etcd/meta/grafana.yml b/etcd/meta/grafana.yml
index 602bad4..9007964 100644
--- a/etcd/meta/grafana.yml
+++ b/etcd/meta/grafana.yml
@@ -4,7 +4,7 @@
etcd-cluster-prometheus:
datasource: prometheus
format: json
- template: etcd/files/grafana_dashboards/etcd_prometheus.json.json
+ template: etcd/files/grafana_dashboards/etcd_prometheus.json
etcd:
datasource: influxdb
format: json
diff --git a/etcd/server/service.sls b/etcd/server/service.sls
index daa4f6c..2f73141 100644
--- a/etcd/server/service.sls
+++ b/etcd/server/service.sls
@@ -61,6 +61,10 @@
- user: root
- group: root
+pull-etcd-image:
+ dockerng.image_present:
+ - name: {{ server.get('image', 'quay.io/coreos/etcd:latest') }}
+
copy-etcd-binaries:
dockerng.running:
- image: {{ server.get('image', 'quay.io/coreos/etcd:latest') }}
@@ -71,6 +75,7 @@
- force: True
- require:
- file: /tmp/etcd
+ - dockerng: pull-etcd-image
{%- for filename in ['etcd', 'etcdctl'] %}