commit 089988628aa0a4c66c70d10b4e9a9d052a38928f
author Martin Polreich <mpolreich@mirantis.com> Fri Sep 01 08:57:22 2017 +0000
committer Gerrit Code Review <gerrit2@b3fef64565ee> Fri Sep 01 08:57:23 2017 +0000
tree ed3cb7bb1d72495e7c7ae8aa044c39effd50c713
parent 9c16e1bec1e5e6db2d0c1ef04ab86e6730bf222d
parent db963241eb9d0b5eb984a6cc65e8c661eb23aad3

Merge "Update run_tests.sh to the latest revision"

etcd/meta/prometheus.yml

diff --git a/etcd/meta/prometheus.yml b/etcd/meta/prometheus.yml
index cdc8de5..1fa8643 100644
--- a/etcd/meta/prometheus.yml
+++ b/etcd/meta/prometheus.yml
@@ -3,6 +3,16 @@
   target:
     static:
       etcd:
+        enabled: true
+        {%- if server.get('ssl', {}).get('enabled') %}
+        scheme: https
+        tls_config:
+          skip_verify: true
+          cert_name: prometheus-server.crt
+          key_name: prometheus-server.key
+        {%- else %}
+        scheme: http
+        {%- endif %}
         endpoint:
           {%- set hostname = grains.get('nodename') %}
           {%- for member in server.members %}

etcd/server/service.sls

diff --git a/etcd/server/service.sls b/etcd/server/service.sls
index 2f73141..240b293 100644
--- a/etcd/server/service.sls
+++ b/etcd/server/service.sls
@@ -131,7 +131,7 @@
     - source: salt://etcd/files/default
     - template: jinja
     - defaults:
-{%- if salt['cmd.run']('. /var/lib/etcd/configenv; etcdctl cluster-health > /dev/null 2>&1; echo $?') != '0' %}
+{%- if salt['cmd.shell']('. /var/lib/etcd/configenv; etcdctl cluster-health > /dev/null 2>&1; echo $?') != '0' %}
         initial_cluster_state: new
 {%- else %}
         initial_cluster_state: existing