• R/O
  • HTTP
  • SSH
  • HTTPS

grid-chef-repo: コミット

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


コミットメタ情報

リビジョン22c9ce42ab65494c110d52473f3d553ac9898f82 (tree)
日時2018-08-28 20:05:33
作者whitestar <whitestar@user...>
コミッターwhitestar

ログメッセージ

refactoring.

変更サマリ

差分

--- a/roles/docker.rb
+++ b/roles/docker.rb
@@ -1,5 +1,5 @@
11 #
2-# Copyright 2016-2017, whitestar
2+# Copyright 2016-2018, 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.
@@ -17,6 +17,14 @@
1717 name 'docker'
1818 description 'Docker Engine'
1919
20+# 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'
24+
25+docker_bip = '192.168.100.1/24'
26+docker_fixed_cidr = '192.168.100.0/24'
27+
2028 run_list(
2129 'role[docker-new-repo]',
2230 )
@@ -29,15 +37,18 @@ default_attributes(
2937 override_attributes(
3038 'docker-grid' => {
3139 'engine' => {
32- #'version' => '', # latest
33- #'userns-remap' => 'default',
40+ #'version' => '', # '' (=latest) or exact version
41+ 'version_on_centos' => docker_ver_on_centos, # '18.06.0.ce-3', '18.03.1.ce-1', '17.12.1.ce-1'
42+ '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'
44+ #'storage-driver_on_ubuntu' => 'overlay2', # defacto: 'aufs'
3445 'daemon_extra_options' => [
3546 '-H fd://',
36- #'-H fd:// --bip=192.168.100.1/24 --fixed-cidr=192.168.100.0/24',
37- # for docker >= 1.10, docker-engine >= 1.12 (on rhel family)
38- # '-H fd://' option automatically removed by this cookbook.
39- # See https://github.com/docker/docker/issues/22847
40- ].join(' '),
47+ "--bip=#{docker_bip} --fixed-cidr=#{docker_fixed_cidr}",
48+ ].join(' '),
49+ },
50+ 'compose' => {
51+ 'version' => docker_compose_ver,
4152 },
4253 },
4354 )
--- a/roles/screwdriver-all-on-docker-override.rb
+++ b/roles/screwdriver-all-on-docker-override.rb
@@ -17,14 +17,16 @@
1717 name 'screwdriver-all-on-docker-override'
1818 description 'Screwdriver with all components on Docker (customized)'
1919
20+# if you set `nil` to its attribute, you can deactivate its override.
2021 docker_skip_setup = false
2122 docker_ver_on_centos = '17.12.1.ce-1'
2223 docker_ver_on_ubuntu = '17.12.1~ce-0'
2324 docker_compose_skip_setup = false
2425 docker_compose_ver = '1.21.2'
26+network_mode_bridge = false
27+
2528 docker_bip = '192.168.100.1/24'
2629 docker_fixed_cidr = '192.168.100.0/24'
27-network_mode_bridge = false
2830 api_ver = 'latest'
2931 ui_ver = 'latest'
3032 store_ver = 'latest'
--- a/roles/screwdriver-on-docker-override.rb
+++ b/roles/screwdriver-on-docker-override.rb
@@ -17,14 +17,16 @@
1717 name 'screwdriver-on-docker-override'
1818 description 'Screwdriver on Docker (customized)'
1919
20+# if you set `nil` to its attribute, you can deactivate its override.
2021 docker_skip_setup = false
2122 docker_ver_on_centos = '17.12.1.ce-1'
2223 docker_ver_on_ubuntu = '17.12.1~ce-0'
2324 docker_compose_skip_setup = false
2425 docker_compose_ver = '1.21.2'
26+network_mode_bridge = false
27+
2528 docker_bip = '192.168.100.1/24'
2629 docker_fixed_cidr = '192.168.100.0/24'
27-network_mode_bridge = false
2830 api_ver = 'latest'
2931 ui_ver = 'latest'
3032 store_ver = 'latest'
旧リポジトリブラウザで表示