• R/O
  • HTTP
  • SSH
  • HTTPS

grid-chef-repo: コミット

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


コミットメタ情報

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

ログメッセージ

refactoring.

変更サマリ

差分

--- a/roles/docker-new-repo.rb
+++ b/roles/docker-new-repo.rb
@@ -36,7 +36,7 @@ override_attributes(
3636 'compose' => {
3737 #'skip_setup' => true, # default: false
3838 'auto_upgrade' => true, # default: false
39- 'release_base_url' => 'https://github.com/docker/compose/releases/download/1.21.2',
39+ 'version' => '1.21.2',
4040 },
4141 'engine' => {
4242 #'skip_setup' => true, # default: false
--- a/roles/screwdriver-all-on-docker-override.rb
+++ b/roles/screwdriver-all-on-docker-override.rb
@@ -17,8 +17,10 @@
1717 name 'screwdriver-all-on-docker-override'
1818 description 'Screwdriver with all components on Docker (customized)'
1919
20+docker_skip_setup = false
2021 docker_ver_on_centos = '17.12.1.ce-1'
2122 docker_ver_on_ubuntu = '17.12.1~ce-0'
23+docker_compose_skip_setup = false
2224 docker_compose_ver = '1.21.2'
2325 docker_bip = '192.168.100.1/24'
2426 docker_fixed_cidr = '192.168.100.0/24'
@@ -40,7 +42,7 @@ run_list(
4042 override_attributes(
4143 'docker-grid' => {
4244 'engine' => {
43- #'skip_setup' => true, # default: false
45+ 'skip_setup' => docker_skip_setup,
4446 #'version' => '', # '' (=latest) or exact version
4547 'version_on_centos' => docker_ver_on_centos, # '18.06.0.ce-3', '18.03.1.ce-1', '17.12.1.ce-1'
4648 'version_on_ubuntu' => docker_ver_on_ubuntu, # '18.06.0~ce~3-0', '18.03.1~ce-0', '17.12.1~ce-0'
@@ -52,8 +54,8 @@ override_attributes(
5254 ].join(' '),
5355 },
5456 'compose' => {
55- #'skip_setup' => true, # default: false
56- 'release_base_url' => "https://github.com/docker/compose/releases/download/#{docker_compose_ver}",
57+ 'skip_setup' => docker_compose_skip_setup,
58+ 'version' => docker_compose_ver,
5759 },
5860 },
5961 'screwdriver' => {
--- a/roles/screwdriver-on-docker-override.rb
+++ b/roles/screwdriver-on-docker-override.rb
@@ -17,8 +17,10 @@
1717 name 'screwdriver-on-docker-override'
1818 description 'Screwdriver on Docker (customized)'
1919
20+docker_skip_setup = false
2021 docker_ver_on_centos = '17.12.1.ce-1'
2122 docker_ver_on_ubuntu = '17.12.1~ce-0'
23+docker_compose_skip_setup = false
2224 docker_compose_ver = '1.21.2'
2325 docker_bip = '192.168.100.1/24'
2426 docker_fixed_cidr = '192.168.100.0/24'
@@ -40,7 +42,7 @@ run_list(
4042 override_attributes(
4143 'docker-grid' => {
4244 'engine' => {
43- #'skip_setup' => true, # default: false
45+ 'skip_setup' => docker_skip_setup,
4446 #'version' => '', # '' (=latest) or exact version
4547 'version_on_centos' => docker_ver_on_centos, # '18.06.0.ce-3', '18.03.1.ce-1', '17.12.1.ce-1'
4648 'version_on_ubuntu' => docker_ver_on_ubuntu, # '18.06.0~ce~3-0', '18.03.1~ce-0', '17.12.1~ce-0'
@@ -52,8 +54,8 @@ override_attributes(
5254 ].join(' '),
5355 },
5456 'compose' => {
55- #'skip_setup' => true, # default: false
56- 'release_base_url' => "https://github.com/docker/compose/releases/download/#{docker_compose_ver}",
57+ 'skip_setup' => docker_compose_skip_setup,
58+ 'version' => docker_compose_ver,
5759 },
5860 },
5961 'screwdriver' => {
旧リポジトリブラウザで表示