• R/O
  • HTTP
  • SSH
  • HTTPS

grid-chef-repo: コミット

Grid環境構築用のChefリポジトリです。


コミットメタ情報

リビジョン8cefbf37c53e68777c55cf4344a7c9d103ae96ab (tree)
日時2019-04-24 18:37:38
作者whitestar <whitestar@user...>
コミッターwhitestar

ログメッセージ

update docker roles.

変更サマリ

差分

--- a/roles/docker-new-repo.rb
+++ b/roles/docker-new-repo.rb
@@ -1,5 +1,5 @@
11 #
2-# Copyright 2016-2017, whitestar
2+# Copyright 2016-2019, whitestar
33 #
44 # Licensed under the Apache License, Version 2.0 (the "License");
55 # you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ override_attributes(
3636 'compose' => {
3737 #'skip_setup' => true, # default: false
3838 'auto_upgrade' => true, # default: false
39- 'version' => '1.21.2',
39+ 'version' => '1.24.0',
4040 },
4141 'engine' => {
4242 #'skip_setup' => true, # default: false
@@ -46,12 +46,12 @@ override_attributes(
4646 #'version_on_centos' => '18.06.0.ce-3', # '18.03.1.ce-1', '17.12.1.ce-1',
4747 'version_on_ubuntu' => '', # latest
4848 #'version_on_ubuntu' => '18.06.0~ce~3-0', # '18.03.1~ce-0', '17.12.1~ce-0'
49- 'storage-driver_on_centos' => 'overlay', # defacto: 'devicemapper'
49+ 'storage-driver_on_centos' => 'overlay2', # defacto: 'devicemapper'
5050 'storage-driver_on_ubuntu' => 'overlay2', # defacto: 'aufs'
5151 #'userns-remap' => 'default',
5252 'daemon_extra_options' => [
5353 '-H fd://',
54- #'-H fd:// --bip=192.168.100.1/24 --fixed-cidr=192.168.100.0/24',
54+ #'--bip=192.168.100.1/24 --fixed-cidr=192.168.100.0/24',
5555 # for docker >= 1.10, docker-engine >= 1.12 (on rhel family)
5656 # '-H fd://' option automatically removed by this cookbook.
5757 # See https://github.com/docker/docker/issues/22847
--- a/roles/docker.rb
+++ b/roles/docker.rb
@@ -1,5 +1,5 @@
11 #
2-# Copyright 2016-2018, whitestar
2+# Copyright 2016-2019, whitestar
33 #
44 # Licensed under the Apache License, Version 2.0 (the "License");
55 # you may not use this file except in compliance with the License.
@@ -18,9 +18,11 @@ name 'docker'
1818 description 'Docker Engine'
1919
2020 # if you set `nil` to its attribute, you can deactivate its override.
21-docker_ver_on_centos = '17.12.1.ce-1'
22-docker_ver_on_ubuntu = '17.12.1~ce-0'
23-docker_compose_ver = '1.21.2'
21+docker_ver_on_centos = nil
22+#docker_ver_on_centos = '17.12.1.ce-1'
23+docker_ver_on_ubuntu = nil
24+#docker_ver_on_ubuntu = '17.12.1~ce-0'
25+docker_compose_ver = '1.24.0'
2426
2527 docker_bip = '192.168.100.1/24'
2628 docker_fixed_cidr = '192.168.100.0/24'
@@ -40,7 +42,7 @@ override_attributes(
4042 #'version' => '', # '' (=latest) or exact version
4143 'version_on_centos' => docker_ver_on_centos, # '18.06.0.ce-3', '18.03.1.ce-1', '17.12.1.ce-1'
4244 'version_on_ubuntu' => docker_ver_on_ubuntu, # '18.06.0~ce~3-0', '18.03.1~ce-0', '17.12.1~ce-0'
43- #'storage-driver_on_centos' => 'overlay', # defacto: 'devicemapper'
45+ #'storage-driver_on_centos' => 'overlay2', # defacto: 'devicemapper'
4446 #'storage-driver_on_ubuntu' => 'overlay2', # defacto: 'aufs'
4547 'daemon_extra_options' => [
4648 '-H fd://',
旧リポジトリブラウザで表示