OSDN > Finden Software > Internet > WWW/HTTP > Indexing/Search > Meta Search > SCM > git > grid-chef-repo > Commit

Meta Search
Fork

R/O
HTTP
SSH
HTTPS

grid-chef-repo: Commit

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

Commit MetaInfo

Revision	0f8c70f0b3ff5f5e4945aff4ddd9e23ce8390fc5 (tree)
Zeit	2017-02-14 22:12:06
Autor	whitestar <whitestar@gaea...>
Commiter	whitestar

Log Message

adds the skip_setup attributes for Docker Engine and Compose.

Ändern Zusammenfassung

modified: cookbooks/docker-grid/CHANGELOG.md (diff)
modified: cookbooks/docker-grid/README.md (diff)
modified: cookbooks/docker-grid/attributes/default.rb (diff)
modified: cookbooks/docker-grid/metadata.rb (diff)
modified: cookbooks/docker-grid/recipes/compose.rb (diff)
modified: cookbooks/docker-grid/recipes/engine.rb (diff)
modified: roles/concourse.rb (diff)
modified: roles/docker-registry.rb (diff)
modified: roles/jenkins.rb (diff)

Diff

--- a/cookbooks/docker-grid/CHANGELOG.md

+++ b/cookbooks/docker-grid/CHANGELOG.md

		@@ -1,5 +1,10 @@
1	1	# docker-grid CHANGELOG
2	2
	3	+0.3.5
	4	+-----
	5	+- adds the `['docker-grid']['engine']['skip_setup']` attribute.
	6	+- adds the `['docker-grid']['compose']['skip_setup']` attribute.
	7	+
3	8	0.3.4
4	9	-----
5	10	- improves CentOS distributed `docker` package support.

--- a/cookbooks/docker-grid/README.md

+++ b/cookbooks/docker-grid/README.md

		@@ -39,11 +39,13 @@ This cookbook sets up Docker engine.
39	39	\|`['docker-grid']['yum_repo']['baseurl']`\|String\|\|`'https://yum.dockerproject.org/repo/main/centos/$releasever/'`\|
40	40	\|`['docker-grid']['yum_repo']['gpgcheck']`\|String\|`'0'`: disabled, `'1'`: enabled.\|`'1'`\|
41	41	\|`['docker-grid']['yum_repo']['gpgkey']`\|String\|\|`'https://yum.dockerproject.org/gpg'`\|
42		-\|`['docker-grid']['compose']['auto_upgrade']`\|String\|upgrade/reinstall the docker-compose automatically.\|`false`\|
	42	+\|`['docker-grid']['compose']['skip_setup']`\|Boolean\|\|`false`\|
	43	+\|`['docker-grid']['compose']['auto_upgrade']`\|Boolean\|upgrade/reinstall the docker-compose automatically.\|`false`\|
43	44	\|`['docker-grid']['compose']['release_base_url']`\|String\|\|`'https://github.com/docker/compose/releases/download/1.9.0'`\|
44	45	\|`['docker-grid']['compose']['release_url']`\|String\|\|`"#{node['docker-grid']['compose']['release_base_url']}/docker-compose-#{node['kernel']['name']}-#{node['kernel']['machine']}"`\|
45	46	\|`['docker-grid']['compose']['home_dir']`\|String\|\|`'/opt/docker-compose'`\|
46	47	\|`['docker-grid']['compose']['app_dir']`\|String\|\|`"#{node['docker-grid']['compose']['home_dir']}/app`\|
	48	+\|`['docker-grid']['engine']['skip_setup']`\|Boolean\|\|`false`\|
47	49	\|`['docker-grid']['engine']['version_on_centos']`\|String\|Docker version for CentOS.\|`'1.11.2-1'`\|
48	50	\|`['docker-grid']['engine']['version_on_ubuntu']`\|String\|Docker version for Ubuntu.\|`'1.11.2-0'`\|
49	51	\|`['docker-grid']['engine']['version']`\|String\|Docker 1.9.x - 1.11.x is recommended for stability reasons. Note: this default value is overwritten by the `version_on_{centos or ubuntu}`.\|See default.rb\|

--- a/cookbooks/docker-grid/attributes/default.rb

+++ b/cookbooks/docker-grid/attributes/default.rb

		@@ -30,6 +30,7 @@ default['docker-grid']['yum_repo'] = {
30	30	'gpgkey' => 'https://yum.dockerproject.org/gpg',
31	31	}
32	32
	33	+default['docker-grid']['compose']['skip_setup'] = false
33	34	# dockerproject: direct download.
34	35	# Note: non-support by this cookbook.
35	36	# os-repository (Ubuntu): http://packages.ubuntu.com/search?keywords=docker-compose&searchon=names

		@@ -40,6 +41,7 @@ default['docker-grid']['compose']['release_url'] = "#{node['docker-grid']['compo
40	41	default['docker-grid']['compose']['home_dir'] = '/opt/docker-compose'
41	42	default['docker-grid']['compose']['app_dir'] = "#{node['docker-grid']['compose']['home_dir']}/app"
42	43
	44	+default['docker-grid']['engine']['skip_setup'] = false
43	45	# dockerproject: 1.13.0-1, 1.12.3-1, 1.11.2-1, 1.10.3-1
44	46	# os-repository: yum list docker
45	47	# http://mirror.centos.org/centos/7.3.1611/extras/x86_64/Packages/

--- a/cookbooks/docker-grid/metadata.rb

+++ b/cookbooks/docker-grid/metadata.rb

		@@ -5,7 +5,7 @@ maintainer_email ''
5	5	license 'Apache 2.0'
6	6	description 'Installs/Configures Docker Engine.'
7	7	long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
8		-version '0.3.4'
	8	+version '0.3.5'
9	9	source_url 'http://scm.osdn.jp/gitroot/metasearch/grid-chef-repo.git'
10	10	issues_url 'https://osdn.jp/projects/metasearch/ticket'
11	11

--- a/cookbooks/docker-grid/recipes/compose.rb

+++ b/cookbooks/docker-grid/recipes/compose.rb

		@@ -19,6 +19,11 @@
19	19
20	20	# See: https://docs.docker.com/compose/install/
21	21
	22	+if node['docker-grid']['compose']['skip_setup']
	23	+ log 'Skip the Docker Compose setup.'
	24	+ return
	25	+end
	26	+
22	27	include_recipe 'docker-grid::engine'
23	28
24	29	home_dir = node['docker-grid']['compose']['home_dir']

--- a/cookbooks/docker-grid/recipes/engine.rb

+++ b/cookbooks/docker-grid/recipes/engine.rb

		@@ -19,6 +19,11 @@
19	19
20	20	# https://dcos.io/docs/1.8/administration/installing/custom/system-requirements/
21	21
	22	+if node['docker-grid']['engine']['skip_setup']
	23	+ log 'Skip the Docker Engine setup.'
	24	+ return
	25	+end
	26	+
22	27	::Chef::Recipe.send(:include, PlatformUtils::Helper)
23	28	::Chef::Recipe.send(:include, PlatformUtils::VirtUtils)
24	29

--- a/roles/concourse.rb

+++ b/roles/concourse.rb

		@@ -22,6 +22,14 @@ override_attributes(
22	22	concourse_cn,
23	23	],
24	24	},
	25	+ 'docker-grid' => {
	26	+ 'engine' => {
	27	+ #'skip_setup' => true, # default: false
	28	+ },
	29	+ 'compose' => {
	30	+ #'skip_setup' => true, # default: false
	31	+ },
	32	+ },
25	33	'concourse-ci' => {
26	34	'with_ssl_cert_cookbook' => false, # or true (for https)
27	35	'ssl_cert' => {

--- a/roles/docker-registry.rb

+++ b/roles/docker-registry.rb

		@@ -15,6 +15,22 @@ run_list(
15	15	registry_cn = 'registry.docker.example.com'
16	16
17	17	override_attributes(
	18	+ 'ssl_cert' => {
	19	+ 'ca_names' => [
	20	+ 'grid_ca',
	21	+ ],
	22	+ 'common_names' => [
	23	+ registry_cn,
	24	+ ],
	25	+ },
	26	+ 'docker-grid' => {
	27	+ 'engine' => {
	28	+ #'skip_setup' => true, # default: false
	29	+ },
	30	+ 'compose' => {
	31	+ #'skip_setup' => true, # default: false
	32	+ },
	33	+ },
18	34	'docker-grid' => {
19	35	'registry' => {
20	36	'with_ssl_cert_cookbook' => true,

		@@ -49,13 +65,5 @@ override_attributes(
49	65	},
50	66	},
51	67	},
52		- 'ssl_cert' => {
53		- 'ca_names' => [
54		- 'grid_ca',
55		- ],
56		- 'common_names' => [
57		- registry_cn,
58		- ],
59		- }
60	68	)
61	69

--- a/roles/jenkins.rb

+++ b/roles/jenkins.rb

		@@ -14,6 +14,19 @@ run_list(
14	14	jenkins_cn = 'jenkins.io.example.com'
15	15
16	16	override_attributes(
	17	+ 'ssl_cert' => {
	18	+ 'common_names' => [
	19	+ jenkins_cn,
	20	+ ],
	21	+ },
	22	+ 'docker-grid' => {
	23	+ 'engine' => {
	24	+ #'skip_setup' => true, # default: false
	25	+ },
	26	+ 'compose' => {
	27	+ #'skip_setup' => true, # default: false
	28	+ },
	29	+ },
17	30	'jenkins-grid' => {
18	31	#'with_ssl_cert_cookbook' => true,
19	32	'ssl_cert' => {

		@@ -54,9 +67,4 @@ override_attributes(
54	67	},
55	68	},
56	69	},
57		- 'ssl_cert' => {
58		- 'common_names' => [
59		- jenkins_cn,
60		- ],
61		- },
62	70	)

Show on old repository browser