• R/O
  • HTTP
  • SSH
  • HTTPS

grid-chef-repo: コミット

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


コミットメタ情報

リビジョン38bca7e20e03380b518115f7c4b6da31d2908972 (tree)
日時2017-09-05 22:33:18
作者whitestar <whitestar@user...>
コミッターwhitestar

ログメッセージ

improves server key pair deployment.

変更サマリ

差分

--- a/cookbooks/screwdriver/CHANGELOG.md
+++ b/cookbooks/screwdriver/CHANGELOG.md
@@ -1,5 +1,9 @@
11 # screwdriver CHANGELOG
22
3+0.2.2
4+-----
5+- improves server key pair deployment.
6+
37 0.2.1
48 -----
59 - revises documents.
--- a/cookbooks/screwdriver/README.md
+++ b/cookbooks/screwdriver/README.md
@@ -176,9 +176,9 @@ run_list(
176176
177177 override_attributes(
178178 'ssl_cert' => {
179- 'common_names' => [
180- cn,
181- ],
179+ #'common_names' => [
180+ # cn, # screwdriver cookbook < 0.2.2
181+ #],
182182 },
183183 'screwdriver' => {
184184 'with_ssl_cert_cookbook' => true,
@@ -288,9 +288,9 @@ $ knife vault update ssl_server_certs screwdriver.io.example.com.prod -S 'name:s
288288 ```ruby
289289 override_attributes(
290290 'ssl_cert' => {
291- 'common_names' => [
292- 'screwdriver.io.example.com',
293- ],
291+ #'common_names' => [
292+ # 'screwdriver.io.example.com', # screwdriver cookbook < 0.2.2
293+ #],
294294 },
295295 'screwdriver' => {
296296 'with_ssl_cert_cookbook' => true,
--- a/cookbooks/screwdriver/metadata.rb
+++ b/cookbooks/screwdriver/metadata.rb
@@ -17,4 +17,4 @@ supports 'ubuntu', '>= 14.04'
1717
1818 depends 'docker-grid', '>= 0.4.0'
1919 #depends 'platform_utils', '>= 0.4.4'
20-depends 'ssl_cert', '>= 0.4.0'
20+depends 'ssl_cert', '>= 0.4.1'
--- a/cookbooks/screwdriver/recipes/docker-compose.rb
+++ b/cookbooks/screwdriver/recipes/docker-compose.rb
@@ -228,9 +228,10 @@ store_uri = store_envs_org['URI']
228228 ui_uri = api_uri.gsub(/:\d+/, ":#{ui_port}") # based on the API URI.
229229
230230 if node['screwdriver']['with_ssl_cert_cookbook']
231+ cn = node['screwdriver']['ssl_cert']['common_name']
232+ append_server_ssl_cn(cn)
231233 include_recipe 'ssl_cert::server_key_pairs'
232234
233- cn = node['screwdriver']['ssl_cert']['common_name']
234235 server_cert = server_cert_content(cn)
235236 server_key = server_key_content(cn)
236237
@@ -300,13 +301,13 @@ store_envs['ECOSYSTEM_UI'] = ui_uri
300301
301302 # Common
302303 if node['screwdriver']['docker-compose']['import_ca']
303- include_recipe 'ssl_cert::ca_certs'
304-
305304 node['screwdriver']['ssl_cert']['ca_names'].each {|ca_name|
305+ append_ca_name(ca_name)
306306 ca_cert_vol = "#{ca_cert_path(ca_name)}:/usr/share/ca-certificates/#{ca_name}.crt:ro"
307307 api_vols.push(ca_cert_vol)
308308 #ui_vols.push(ca_cert_vol)
309309 }
310+ include_recipe 'ssl_cert::ca_certs'
310311
311312 import_ca_script = '/usr/local/bin/screwdriver_import_ca'
312313 template "#{bin_dir}/screwdriver_import_ca" do
--- a/cookbooks/screwdriver/version
+++ b/cookbooks/screwdriver/version
@@ -1 +1 @@
1-0.2.1
1+0.2.2
旧リポジトリブラウザで表示