Grid環境構築用のChefリポジトリです。
Révision | be77142304bf34bed39155bc3a31e29459edccd5 (tree) |
---|---|
l'heure | 2016-12-18 10:10:46 |
Auteur | whitestar <whitestar@gaea...> |
Commiter | whitestar |
bug fix: modifies apt-get update timing for the updated apt-line on Ubuntu.
@@ -1,5 +1,9 @@ | ||
1 | 1 | # docker-grid CHANGELOG |
2 | 2 | |
3 | +0.2.6 | |
4 | +----- | |
5 | +- bug fix: modifies `apt-get update` timing for the updated apt-line on Ubuntu. | |
6 | + | |
3 | 7 | 0.2.5 |
4 | 8 | ----- |
5 | 9 | - adds `docker` service's handling of CA certificate update events. |
@@ -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.2.5' | |
8 | +version '0.2.6' | |
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 |
@@ -186,22 +186,30 @@ when 'debian' | ||
186 | 186 | end |
187 | 187 | } |
188 | 188 | |
189 | - template '/etc/apt/sources.list.d/docker.list' do | |
190 | - source 'etc/apt/sources.list.d/docker.list' | |
191 | - owner 'root' | |
192 | - group 'root' | |
193 | - mode '0644' | |
189 | + apt_get_update = 'apt-get_update' | |
190 | + resources(execute: apt_get_update) rescue execute apt_get_update do | |
191 | + command 'apt-get update' | |
192 | + action :nothing | |
194 | 193 | end |
195 | 194 | |
196 | 195 | apt_repo_config = node['docker-grid']['apt_repo'] |
197 | 196 | bash 'apt-key_adv_docker_tools_key' do |
198 | 197 | code <<-"EOH" |
199 | 198 | apt-key adv --keyserver #{apt_repo_config['keyserver']} --recv-keys #{apt_repo_config['recv-keys']} |
200 | - apt-get update | |
199 | + #apt-get update | |
201 | 200 | EOH |
202 | 201 | not_if 'apt-key list | grep -i docker' |
203 | 202 | end |
204 | 203 | |
204 | + template '/etc/apt/sources.list.d/docker.list' do | |
205 | + source 'etc/apt/sources.list.d/docker.list' | |
206 | + owner 'root' | |
207 | + group 'root' | |
208 | + mode '0644' | |
209 | + notifies :run, "bash[apt-key_adv_docker_tools_key]", :before | |
210 | + notifies :run, "execute[#{apt_get_update}]", :immediately | |
211 | + end | |
212 | + | |
205 | 213 | # Pinning Docker version |
206 | 214 | template '/etc/apt/preferences.d/docker.pref' do |
207 | 215 | source 'etc/apt/preferences.d/docker.pref' |