commit 6b18238f53ee36f97f94d253a5664120f705295e
author Bartosz Kupidura <bkupidura@mirantis.com> Fri Jul 28 14:44:41 2017 +0200
committer Bartosz Kupidura <bkupidura@mirantis.com> Tue Aug 01 12:02:30 2017 +0200
tree 65e358d1f368b670af940a6a576a89fcb358bbce
parent e84d8fd2f29f7bf4d6868594eb06fee93a45e761

Use server.dir.config_in_container for ssl dir

Remove prometheus.server.target.etcd

Change-Id: I6aff1e6413eff860f3d5f22a772a0182fbaf659e
Depends-On: I7ab68a64f6730fd5a28db28c1e63f7e2cce95473

prometheus/server/init.yml

diff --git a/prometheus/server/init.yml b/prometheus/server/init.yml
index 0ecea17..2c241bd 100644
--- a/prometheus/server/init.yml
+++ b/prometheus/server/init.yml
@@ -2,3 +2,7 @@
   _param:
     prometheus_server_config_directory: /srv/prometheus
     prometheus_server_data_directory: /data
+  prometheus:
+    server:
+      dir:
+        config_in_container: ${_param:prometheus_server_config_directory}

prometheus/server/target/etcd.yml

diff --git a/prometheus/server/target/etcd.yml b/prometheus/server/target/etcd.yml
deleted file mode 100644
index 0ac3310..0000000
--- a/prometheus/server/target/etcd.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
-  prometheus:
-    server:
-      target:
-        static:
-          etcd:
-            enabled: true
-            scheme: https
-            tls_config:
-              skip_verify: true
-              ssl_dir: ${_param:prometheus_server_config_directory}
-              cert_name: prometheus-server.crt
-              key_name: prometheus-server.key

prometheus/server/target/kubernetes.yml

diff --git a/prometheus/server/target/kubernetes.yml b/prometheus/server/target/kubernetes.yml
index 60ca1e0..919c916 100644
--- a/prometheus/server/target/kubernetes.yml
+++ b/prometheus/server/target/kubernetes.yml
@@ -5,6 +5,5 @@
         kubernetes:
           enabled: true
           api_ip: ${_param:kubernetes_control_address}
-          ssl_dir: ${_param:prometheus_server_config_directory}
           cert_name: prometheus-server.crt
           key_name: prometheus-server.key