commit a05621f7b68ba8ae7d2a08a98caddcae6f10425f
author marco <m.celoud@tcpcloud.eu> Thu Jul 14 10:35:24 2016 +0200
committer marco <m.celoud@tcpcloud.eu> Fri Jul 15 12:04:54 2016 +0200
tree d08d0d9c116108b2911a60c493bef269fc72f6bc
parent 9959bdac96df8ad4f9d6c10357c1d1c55a8cc623

add fixes

metadata/service/master/cluster.yml

diff --git a/metadata/service/master/cluster.yml b/metadata/service/master/cluster.yml
index 6359e40..f68e5ff 100644
--- a/metadata/service/master/cluster.yml
+++ b/metadata/service/master/cluster.yml
@@ -49,4 +49,13 @@
         engine: none
       namespace:
         kube-system:
-          enabled: True
\ No newline at end of file
+          enabled: True
+      network:
+        etcd:
+          members:
+          - host: ${_param:cluster_node01_address}
+            port: 4001
+          - host: ${_param:cluster_node02_address}
+            port: 4001
+          - host: ${_param:cluster_node03_address}
+            port: 4001
\ No newline at end of file

metadata/service/master/single.yml

diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml
index c145469..2f76e7d 100644
--- a/metadata/service/master/single.yml
+++ b/metadata/service/master/single.yml
@@ -45,4 +45,9 @@
         engine: none
       namespace:
         kube-system:
-          enabled: True
\ No newline at end of file
+          enabled: True
+      network:
+        etcd:
+          members:
+            - host: ${_param:single_address}
+              port: 4001
\ No newline at end of file

metadata/service/pool/cluster.yml

diff --git a/metadata/service/pool/cluster.yml b/metadata/service/pool/cluster.yml
index dc87cbb..e79a104 100644
--- a/metadata/service/pool/cluster.yml
+++ b/metadata/service/pool/cluster.yml
@@ -18,12 +18,7 @@
             - host: ${_param:cluster_node01_address}
             - host: ${_param:cluster_node02_address}
             - host: ${_param:cluster_node03_address}
-        etcd:
-          members:
-            - host: ${_param:cluster_node01_address}
-            - host: ${_param:cluster_node02_address}
-            - host: ${_param:cluster_node03_address}
-      address: 0.0.0.0
+      address: ${_param:cluster_local_address}
       cluster_dns: 10.254.0.10
       cluster_domain: cluster.local
       kubelet:
@@ -33,4 +28,13 @@
       token:
         kubelet: ${_param:kubernetes_kubelet_token}
         kube_proxy: ${_param:kubernetes_kube-proxy_token}
-      ca: kubernetes
\ No newline at end of file
+      ca: kubernetes
+      network:
+        etcd:
+          members:
+          - host: ${_param:cluster_node01_address}
+            port: 4001
+          - host: ${_param:cluster_node02_address}
+            port: 4001
+          - host: ${_param:cluster_node03_address}
+            port: 4001
\ No newline at end of file

metadata/service/pool/single.yml

diff --git a/metadata/service/pool/single.yml b/metadata/service/pool/single.yml
index ac4254e..68ec845 100644
--- a/metadata/service/pool/single.yml
+++ b/metadata/service/pool/single.yml
@@ -30,4 +30,9 @@
       token:
         kubelet: ${_param:kubernetes_kubelet_token}
         kube_proxy: ${_param:kubernetes_kube-proxy_token}
-      ca: kubernetes
\ No newline at end of file
+      ca: kubernetes
+      network:
+        etcd:
+          members:
+            - host: ${_param:master_address}
+              port: 4001
\ No newline at end of file