dcos-grid CHANGELOG
===================
+0.4.0
+-----
+- separates the `docker-grid` cookbook.
+
0.3.5
-----
- refactoring.
- [Requirements](#requirements)
- [platforms](#platforms)
- [packages](#packages)
+ - [cookbooks](#cookbooks)
- [Attributes](#attributes)
- [Usage](#usage)
- [Recipes](#recipes)
### packages
- none.
+### cookbooks
+- `docker-grid` (for `dcos-grid` ver. 0.4.0 or later).
+
## Attributes
|Key|Type|Description, example|Default|
|:--|:--|:--|:--|
|`['dcos-grid']['dcos_release_url']`|String|DC/OS download URL.|`'https://downloads.dcos.io/dcos/stable/dcos_generate_config.sh'`|
|`['dcos-grid']['dcos_cli_release_url']`|String|DC/OS CLI download URL (ver. 0.3.0 or later).|`'https://downloads.dcos.io/binaries/cli/linux/x86-64/0.4.10/dcos'`|
-|`['dcos-grid']['docker']['apt_repo']['url']`|String| (ver. 0.3.1 or later)|`'https://apt.dockerproject.org/repo'`|
-|`['dcos-grid']['docker']['apt_repo']['keyserver']`|String| (ver. 0.3.1 or later)|`'hkp://p80.pool.sks-keyservers.net:80'`|
-|`['dcos-grid']['docker']['apt_repo']['recv-keys']`|String| (ver. 0.3.1 or later)|`'58118E89F3A912897C070ADBF76221572C52609D'`|
-|`['dcos-grid']['docker']['yum_repo']['baseurl']`|String| (ver. 0.3.1 or later)|`'https://yum.dockerproject.org/repo/main/centos/$releasever/'`|
-|`['dcos-grid']['docker']['yum_repo']['gpgcheck']`|String|`'0'`: disabled, `'1'`: enabled (ver. 0.3.1 or later).|`'1'`|
-|`['dcos-grid']['docker']['yum_repo']['gpgkey']`|String| (ver. 0.3.1 or later)|`'https://yum.dockerproject.org/gpg'`|
+|`['dcos-grid']['docker']['apt_repo']['url']`|String|DEPRECATED: use `['docker-grid']['apt_repo']['url']` (ver. 0.4.0 or later)|`nil`|
+|`['dcos-grid']['docker']['apt_repo']['keyserver']`|String|DEPRECATED: use `['docker-grid']['apt_repo']['keyserver']` (ver. 0.4.0 or later)|`nil`|
+|`['dcos-grid']['docker']['apt_repo']['recv-keys']`|String|DEPRECATED: use `['docker-grid']['apt_repo']['recv-keys']` (ver. 0.4.0 or later)|`nil`|
+|`['dcos-grid']['docker']['yum_repo']['baseurl']`|String|DEPRECATED: use `['docker-grid']['yum_repo']['baseurl']` (ver. 0.4.0 or later)|`nil`|
+|`['dcos-grid']['docker']['yum_repo']['gpgcheck']`|String|DEPRECATED: use `['docker-grid']['yum_repo']['gpgcheck']` (ver. 0.4.0 or later). `'0'`: disabled, `'1'`: enabled.|`nil`|
+|`['dcos-grid']['docker']['yum_repo']['gpgkey']`|String|DEPRECATED: use `['docker-grid']['yum_repo']['gpgkey']` (ver. 0.4.0 or later)|`nil`|
|`['dcos-grid']['docker-engine']['setup']`|Boolean|Docker setup by this cookbook. If you will set up Docker by another cookbook, verify that this attribute is false. (ver. 0.3.0 or later)|`true`|
-|`['dcos-grid']['docker-engine']['version_on_centos']`|String|Docker version for CentOS (ver. 0.3.0 or later).|`'1.11.2-1'`|
-|`['dcos-grid']['docker-engine']['version_on_ubuntu']`|String|Docker version for Ubuntu (ver. 0.3.0 or later).|`'1.11.2-0'`|
-|`['dcos-grid']['docker-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}` (ver. 0.3.0 or later).|See default.rb|
-|`['dcos-grid']['docker-engine']['storage-driver_on_centos']`|String|Docker storage driver (overlay, devicemapper, ...) for CentOS (ver. 0.3.4 or later).|`'overlay'`|
-|`['dcos-grid']['docker-engine']['storage-driver_on_ubuntu']`|String|Docker storage driver (aufs, overlay, ...) for Ubuntu (ver. 0.3.4 or later).|`'aufs'`|
-|`['dcos-grid']['docker-engine']['storage-driver']`|String|(ver. 0.3.4 or later).|See default.rb|
-|`['dcos-grid']['docker-engine']['daemon_extra_options']`|String|ref. `docker daemon --help` (ver. 0.3.4 or later).|`'-H fd://'`|
+|`['dcos-grid']['docker-engine']['version_on_centos']`|String|DEPRECATED: use `['docker-grid']['engine']['version_on_centos']` (ver. 0.4.0 or later). Docker version for CentOS.|`nil`|
+|`['dcos-grid']['docker-engine']['version_on_ubuntu']`|String|DEPRECATED: use `['docker-grid']['engine']['version_on_ubuntu']` (ver. 0.4.0 or later). Docker version for Ubuntu.|`nil`|
+|`['dcos-grid']['docker-engine']['version']`|String|DEPRECATED: use `['docker-grid']['engine']['version']` (ver. 0.4.0 or later). 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|
+|`['dcos-grid']['docker-engine']['storage-driver_on_centos']`|String|DEPRECATED: use `['docker-grid']['engine']['storage-driver_on_centos']` (ver. 0.4.0 or later). Docker storage driver (overlay, devicemapper, ...) for CentOS.|`nil`|
+|`['dcos-grid']['docker-engine']['storage-driver_on_ubuntu']`|String|DEPRECATED: use `['docker-grid']['engine']['storage-driver_on_ubuntu']` (ver. 0.4.0 or later). Docker storage driver (aufs, overlay, ...) for Ubuntu.|`nil`|
+|`['dcos-grid']['docker-engine']['storage-driver']`|String|DEPRECATED: use `['docker-grid']['engine']['storage-driver']` (ver. 0.4.0 or later).|See default.rb|
+|`['dcos-grid']['docker-engine']['daemon_extra_options']`|String|DEPRECATED: use `['docker-grid']['engine']['daemon_extra_options']` (ver. 0.4.0 or later). ref. `docker daemon --help`.|`nil`|
|`['dcos-grid']['bootstrap']['ip']`|String|Bootstrap node IP address.|`'127.0.0.1'`|
|`['dcos-grid']['bootstrap']['port']`|String|Bootstrap node port number.|`'8080'`|
|`['dcos-grid']['bootstrap']['genconf_dir']`|String|genconf directory path. Note: This is overridden by the value `"#{node['dcos-grid']['cloud-config']['target_dir']}/genconf"` in the `cloud-config` recipe (ver. 0.3.5 or later).|`'/opt/dcos-grid/genconf'`|
)
override_attributes(
- 'dcos-grid' => {
- 'dcos_release_url' => 'https://downloads.dcos.io/dcos/stable/dcos_generate_config.sh',
- #'dcos_release_url' => 'https://downloads.dcos.io/dcos/EarlyAccess/dcos_generate_config.sh',
- 'docker-engine' => {
+ 'docker-grid' => {
+ 'engine' => {
'version_on_centos' => '1.11.2-1',
'version_on_ubuntu' => '1.11.2-0',
#'version' => '1.11.2-1.el7.centos',
},
+ },
+ 'dcos-grid' => {
+ 'dcos_release_url' => 'https://downloads.dcos.io/dcos/stable/dcos_generate_config.sh',
+ #'dcos_release_url' => 'https://downloads.dcos.io/dcos/EarlyAccess/dcos_generate_config.sh',
'bootstrap' => {
'ip' => '192.168.56.100',
'port' => '8080',
default['dcos-grid']['dcos_release_url'] = 'https://downloads.dcos.io/dcos/stable/dcos_generate_config.sh'
default['dcos-grid']['dcos_cli_release_url'] = 'https://downloads.dcos.io/binaries/cli/linux/x86-64/0.4.10/dcos'
+# DEPRECATED: ['dcos-grid']['docker'][*] attributes. Use ['docker-grid'][*]
default['dcos-grid']['docker']['apt_repo'] = {
- 'url' => 'https://apt.dockerproject.org/repo',
- 'keyserver' => 'hkp://p80.pool.sks-keyservers.net:80',
- 'recv-keys' => '58118E89F3A912897C070ADBF76221572C52609D',
+ 'url' => nil,
+ 'keyserver' => nil,
+ 'recv-keys' => nil,
}
default['dcos-grid']['docker']['yum_repo'] = {
- 'baseurl' => 'https://yum.dockerproject.org/repo/main/centos/$releasever/',
- 'gpgcheck' => '1',
- 'gpgkey' => 'https://yum.dockerproject.org/gpg',
+ 'baseurl' => nil,
+ 'gpgcheck' => nil,
+ 'gpgkey' => nil,
}
+# DEPRECATED: ['dcos-grid']['docker-engine'][*] attributes except for ['dcos-grid']['docker-engine']['setup']
+# Use ['docker-grid']['engine'][*]
default['dcos-grid']['docker-engine']['setup'] = true
-default['dcos-grid']['docker-engine']['version_on_centos'] = '1.11.2-1'
-default['dcos-grid']['docker-engine']['version_on_ubuntu'] = '1.11.2-0'
-default['dcos-grid']['docker-engine']['version'] = node.value_for_platform(
- ['centos', 'redhat'] => {
- 'default' => "#{node['dcos-grid']['docker-engine']['version_on_centos']}.el#{node['platform_version'].to_i}.#{node['platform']}",
- },
- 'ubuntu' => {
- 'default' => "#{node['dcos-grid']['docker-engine']['version_on_ubuntu']}~#{node['lsb']['codename']}",
- }
-)
-default['dcos-grid']['docker-engine']['storage-driver_on_centos'] = 'overlay'
-default['dcos-grid']['docker-engine']['storage-driver_on_ubuntu'] = 'aufs'
-default['dcos-grid']['docker-engine']['storage-driver'] = node.value_for_platform(
- ['centos', 'redhat'] => {
- 'default' => node['dcos-grid']['docker-engine']['storage-driver_on_centos'],
- },
- 'ubuntu' => {
- 'default' => node['dcos-grid']['docker-engine']['storage-driver_on_ubuntu'],
- }
-)
-default['dcos-grid']['docker-engine']['daemon_extra_options'] = '-H fd://'
+default['dcos-grid']['docker-engine']['version_on_centos'] = nil
+default['dcos-grid']['docker-engine']['version_on_ubuntu'] = nil
+default['dcos-grid']['docker-engine']['version'] = nil
+default['dcos-grid']['docker-engine']['storage-driver_on_centos'] = nil
+default['dcos-grid']['docker-engine']['storage-driver_on_ubuntu'] = nil
+default['dcos-grid']['docker-engine']['storage-driver'] = nil
+default['dcos-grid']['docker-engine']['daemon_extra_options'] = nil
default['dcos-grid']['bootstrap']['ip'] = '127.0.0.1'
default['dcos-grid']['bootstrap']['port'] = '8080'
default['dcos-grid']['bootstrap']['genconf_dir'] = '/opt/dcos-grid/genconf'
license 'Apache 2.0'
description 'Installs/Configures DC/OS Cluster Node.'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '0.3.5'
+version '0.4.0'
source_url 'http://scm.osdn.jp/gitroot/metasearch/grid-chef-repo.git'
issues_url 'https://osdn.jp/projects/metasearch/ticket'
end
# Experimental
supports 'ubuntu', '>= 16.04'
+
+# external cookbooks
+depends 'docker-grid', '>= 0.1.0'
--- /dev/null
+#
+# Cookbook Name:: dcos-grid
+# Recipe:: docker-engine
+#
+# Copyright 2016, whitestar
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# https://dcos.io/docs/1.8/administration/installing/custom/system-requirements/
+
+# for deprecated attributes
+[
+ 'apt_repo',
+ 'yum_repo',
+].each {|pkey|
+ node['dcos-grid']['docker'][pkey].each {|key, value|
+ node.override['docker-grid'][pkey][key] = value unless value.nil?
+ }
+}
+
+node['dcos-grid']['docker-engine'].each {|key, value|
+ next if key == 'setup'
+ node.override['docker-grid']['engine'][key] = value unless value.nil?
+}
+
+include_recipe 'docker-grid::engine'
action :create
end
-bash 'systemctl_daemon-reload' do
- code <<-EOH
- systemctl daemon-reload
- EOH
- action :nothing
-end
-
if node['dcos-grid']['docker-engine']['setup']
- if node['dcos-grid']['docker-engine']['storage-driver'] == 'overlay'
- bash 'load_overlayfs_kernel_module' do
- code <<-EOH
- modprobe overlay
- EOH
- not_if 'lsmod | grep overlay'
- end
-
- template '/etc/modules-load.d/overlay.conf' do
- source 'etc/modules-load.d/overlay.conf'
- owner 'root'
- group 'root'
- mode '0644'
- end
- end
-
- directory '/etc/systemd/system/docker.service.d' do
- owner 'root'
- group 'root'
- mode '0755'
- action :create
- end
-
- template '/etc/systemd/system/docker.service.d/override.conf' do
- source 'etc/systemd/system/docker.service.d/override.conf'
- owner 'root'
- group 'root'
- mode '0644'
- notifies :run, 'bash[systemctl_daemon-reload]'
- notifies :restart, 'service[docker]'
- end
+ include_recipe 'dcos-grid::docker-engine'
end
case node['platform_family']
group 'root'
mode '0644'
end
-
- # https://dcos.io/docs/1.8/administration/installing/custom/system-requirements/install-docker-centos/
- if node['dcos-grid']['docker-engine']['setup']
- template '/etc/yum.repos.d/docker.repo' do
- source 'etc/yum.repos.d/docker.repo'
- owner 'root'
- group 'root'
- mode '0644'
- end
-
- [
- 'docker-engine-selinux',
- 'docker-engine',
- ].each {|pkg|
- package pkg do
- action :install
- version node['dcos-grid']['docker-engine']['version']
- # dockerrepo is disabled by default to prevent automatic update.
- options '--enablerepo=dockerrepo'
- end
- }
-
- service 'docker' do
- action [:start, :enable]
- end
- end
when 'debian'
[
'tar',
end
}
- # https://docs.docker.com/engine/installation/linux/ubuntulinux/
- if node['dcos-grid']['docker-engine']['setup']
- pkgs = [
- 'apt-transport-https',
- 'ca-certificates',
- ]
-
- if node['dcos-grid']['docker-engine']['storage-driver'] == 'aufs'
- pkgs += [
- "linux-image-extra-#{node['os_version']}",
- 'linux-image-extra-virtual',
- ]
- end
-
- pkgs.each {|pkg|
- package pkg do
- action :install
- end
- }
-
- template '/etc/apt/sources.list.d/docker.list' do
- source 'etc/apt/sources.list.d/docker.list'
- owner 'root'
- group 'root'
- mode '0644'
- end
-
- apt_repo_config = node['dcos-grid']['docker']['apt_repo']
- bash 'apt-key_adv_docker_tools_key' do
- code <<-"EOH"
- apt-key adv --keyserver #{apt_repo_config['keyserver']} --recv-keys #{apt_repo_config['recv-keys']}
- apt-get update
- EOH
- not_if 'apt-key list | grep -i docker'
- end
-
- # Pinning Docker version
- template '/etc/apt/preferences.d/docker.pref' do
- source 'etc/apt/preferences.d/docker.pref'
- owner 'root'
- group 'root'
- mode '0644'
- end
-
- [
- 'docker-engine',
- ].each {|pkg|
- package pkg do
- action :install
- version node['dcos-grid']['docker-engine']['version']
- end
- }
-
- service 'docker' do
- action [:start, :enable]
- end
- end
-
# work around for DC/OS service units
link '/usr/bin/mkdir' do
to '/bin/mkdir'
+++ /dev/null
-Package: docker-engine
-Pin: version <%= node['dcos-grid']['docker-engine']['version'] %>
-Pin-Priority: 1001
+++ /dev/null
-deb <%= node['dcos-grid']['docker']['apt_repo']['url'] %> ubuntu-<%= node['lsb']['codename'] %> main
+++ /dev/null
-<%
-extra_options = node['dcos-grid']['docker-engine']['daemon_extra_options']
-storage_driver = node['dcos-grid']['docker-engine']['storage-driver']
-storage_driver_option = ''
-if !storage_driver.nil? && !storage_driver.empty?
- storage_driver_option = "--storage-driver=#{storage_driver}"
-end
--%>
-[Service]
-ExecStart=
-ExecStart=/usr/bin/docker daemon <%= storage_driver_option %> <%= extra_options %>
+++ /dev/null
-<%
-config = node['dcos-grid']['docker']['yum_repo']
--%>
-[dockerrepo]
-name=Docker Repository
-baseurl=<%= config['baseurl'] %>
-# dockerrepo is disabled by default to prevent automatic update.
-enabled=0
-gpgcheck=<%= config['gpgcheck'] %>
-gpgkey=<%= config['gpgkey'] %>
)
override_attributes(
- 'dcos-grid' => {
- 'dcos_release_url' => 'https://downloads.dcos.io/dcos/stable/dcos_generate_config.sh',
- #'dcos_release_url' => 'https://downloads.dcos.io/dcos/EarlyAccess/dcos_generate_config.sh',
- 'docker-engine' => {
+ 'docker-grid' => {
+ 'engine' => {
'version_on_centos' => '1.11.2-1',
'version_on_ubuntu' => '1.11.2-0',
},
+ },
+ 'dcos-grid' => {
+ 'dcos_release_url' => 'https://downloads.dcos.io/dcos/stable/dcos_generate_config.sh',
+ #'dcos_release_url' => 'https://downloads.dcos.io/dcos/EarlyAccess/dcos_generate_config.sh',
'bootstrap' => {
'ip' => '192.168.56.100',
'port' => '8080',
OSDN Git Service
