improves jenkins roles.

[metasearch/grid-chef-repo.git] / roles / kube.rb

diff --git a/roles/kube.rb b/roles/kube.rb
index 30970f7..cc52065 100644 (file)
--- a/roles/kube.rb
+++ b/roles/kube.rb
@@ -16,13 +16,20 @@ override_attributes(
     #'install_flavor' => 'dockerproject',
     'install_flavor' => 'os-repository',
     'engine' => {
-      'version_on_centos' => '1.12.5-14',  # docker package
-      #'version_on_centos' => '1.11.2-1',  # docker-engine package
-      'version_on_ubuntu' => '1.12.3-0ubuntu4~16.04.2',  # docker.io package
-      #'version_on_ubuntu' => '1.11.2-0',  # docker-engine package
+      #'version_on_centos' => '1.13.0-1',   # docker-engine
+      #'version_on_centos' => '1.12.6-1',   # docker-engine
+      'version_on_centos' => '1.12.5-14',  # docker
+      #'version_on_centos' => '1.11.2-1',   # docker-engine
+      #'version_on_centos' => '1.10.3-1',   # docker-engine
+      #'version_on_centos' => '1.10.3-59',  # docker
+      #'version_on_ubuntu' => '1.13.0-0',   # docker-engine
+      #'version_on_ubuntu' => '1.12.3-0',   # docker-engine
+      'version_on_ubuntu' => '1.12.3-0ubuntu4~16.04.2',  # docker.io
+      #'version_on_ubuntu' => '1.11.2-0',   # docker-engine
+      #'version_on_ubuntu' => '1.10.3-0ubuntu6',          # docker.io
       'storage-driver_on_centos' => 'overlay',
       'storage-driver_on_ubuntu' => 'overlay',  # default: aufs
-      #'userns-remap' => 'default',
+      #'userns-remap' => 'default',  # Use Kubernetes Security Context instead.
       'daemon_extra_options' => '-H fd:// --bip=192.168.128.1/24 --fixed-cidr=192.168.128.0/24',
       # for docker >= 1.10, docker-engine >= 1.12 (on rhel family)
       # '-H fd://' option automatically removed by this cookbook.