commit eb44a150fad52948fb5c155e17e577202f270333
author Matthew Mosesohn <mmosesohn@mirantis.com> Mon Aug 21 15:23:55 2017 +0000
committer Gerrit Code Review <gerrit2@7fdf03a22773> Mon Aug 21 15:23:56 2017 +0000
tree 4338f81c312643ec950693f51fb9e7e3cb882303
parent 4294236b5b6f1d2194a033fd70c397eff3d4c13f
parent 8c4ca8db86d9c9826c6524daee873817f3d121e5

Merge "Substitute _ in cluster domain"

kubernetes/meta/prometheus.yml

diff --git a/kubernetes/meta/prometheus.yml b/kubernetes/meta/prometheus.yml
index a8f71cc..df0ee76 100644
--- a/kubernetes/meta/prometheus.yml
+++ b/kubernetes/meta/prometheus.yml
@@ -11,6 +11,11 @@
 server:
 {%- if network.get('engine', '') == 'calico' and network.get('prometheus', {}).get('enabled', False) %}
   target:
+    kubernetes:
+      enabled: true
+      api_ip: ${_param:kubernetes_control_address}
+      cert_name: prometheus-server.crt
+      key_name: prometheus-server.key
     static:
       calico:
         endpoint:

metadata/service/pool/single.yml

diff --git a/metadata/service/pool/single.yml b/metadata/service/pool/single.yml
index 4e7a736..05f1223 100644
--- a/metadata/service/pool/single.yml
+++ b/metadata/service/pool/single.yml
@@ -21,7 +21,7 @@
       address: 0.0.0.0
       cluster_dns: 10.254.0.10
       allow_privileged: True
-      cluster_domain: ${param:kubernetes_cluster_domain}
+      cluster_domain: ${_param:kubernetes_cluster_domain}
       kubelet:
         config: /etc/kubernetes/manifests
         allow_privileged: True