commit 222397dbb5e4deed33468db2fc5379fb6a805833
author marco <m.celoud@tcpcloud.eu> Fri Jul 01 10:01:32 2016 +0200
committer marco <m.celoud@tcpcloud.eu> Sun Jul 03 15:11:18 2016 +0200
tree 4e9d9a523b74f39925f3b2a31555ae6efb40909f
parent d44c65d334307e7e7d1023b8f49977d7a8f0fa02

install k8s from package

metadata/service/common.yml

diff --git a/metadata/service/common.yml b/metadata/service/common.yml
index 47364d9..f1f8197 100644
--- a/metadata/service/common.yml
+++ b/metadata/service/common.yml
@@ -1,6 +1,5 @@
 parameters:
   kubernetes:
     common:
-      binaries_version: v1.1.1
       network:
         engine: none
\ No newline at end of file

metadata/service/master/cluster.yml

diff --git a/metadata/service/master/cluster.yml b/metadata/service/master/cluster.yml
index c528ed3..2d118ff 100644
--- a/metadata/service/master/cluster.yml
+++ b/metadata/service/master/cluster.yml
@@ -17,7 +17,7 @@
   kubernetes:
     master:
       enabled: true
-      version: v1.2.0
+      version: ${_param:kubernetes_version}
       registry: tcpcloud
       service_addresses: 10.254.0.0/16
       admin:

metadata/service/master/single.yml

diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml
index 779359f..e240ed6 100644
--- a/metadata/service/master/single.yml
+++ b/metadata/service/master/single.yml
@@ -17,7 +17,7 @@
   kubernetes:
     master:
       enabled: true
-      version: v1.2.0
+      version: ${_param:kubernetes_version}
       registry: tcpcloud
       service_addresses: 10.254.0.0/16
       admin:

metadata/service/pool/cluster.yml

diff --git a/metadata/service/pool/cluster.yml b/metadata/service/pool/cluster.yml
index cebe9fc..e05d323 100644
--- a/metadata/service/pool/cluster.yml
+++ b/metadata/service/pool/cluster.yml
@@ -7,7 +7,8 @@
   kubernetes:
     pool:
       enabled: true
-      version: v1.2.0
+      version: ${_param:kubernetes_version}
+      registry: tcpcloud
       master:
         host: ${_param:cluster_vip_address}
         apiserver:

metadata/service/pool/single.yml

diff --git a/metadata/service/pool/single.yml b/metadata/service/pool/single.yml
index b219527..b4bb7df 100644
--- a/metadata/service/pool/single.yml
+++ b/metadata/service/pool/single.yml
@@ -7,7 +7,8 @@
   kubernetes:
     pool:
       enabled: true
-      version: v1.2.0
+      version: ${_param:kubernetes_version}
+      registry: tcpcloud
       master:
         host: ${_param:master_address}
         apiserver: