• R/O
  • HTTP
  • SSH
  • HTTPS

grid-chef-repo: コミット

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


コミットメタ情報

リビジョンa09148e1d6d373c43e0f86605e0aa5e9263e4465 (tree)
日時2017-08-23 22:40:56
作者whitestar <whitestar@user...>
コミッターwhitestar

ログメッセージ

includes the ssl_cert::server_key_pairs recipe in the chef_utils::chef-server-configuration recipe automatically.

変更サマリ

差分

--- a/cookbooks/chef_utils/CHANGELOG.md
+++ b/cookbooks/chef_utils/CHANGELOG.md
@@ -1,6 +1,11 @@
11 CHANGELOG for chef_utils
22 =========================
33
4+0.8.3
5+-----
6+- includes the `ssl_cert::server_key_pairs` recipe in the `chef_utils::chef-server-configuration` recipe automatically.
7+- adds a guard property for ARM architecture to the `chef-client` recipe.
8+
49 0.8.2
510 -----
611 - adds the Concourse pipeline configuration.
--- a/cookbooks/chef_utils/concourse.yml
+++ b/cookbooks/chef_utils/concourse.yml
@@ -1,26 +1,15 @@
11 ---
22 # $ fly -t target sp -p chef_utils-cookbook -c concourse.yml -l fly-vars.yml -l ~/sec/credentials-prod.yml
3-resource_types:
4-- name: ya-git
5- type: docker-image
6- source:
7- repository: whitestar/git-resource
8- registry_mirror: https://((registry-mirror-domain))
9- ca_certs:
10- - domain: ((registry-mirror-domain))
11- cert: ((docker-reg-ca-cert))
12-
133 resources:
144 - name: src-git
15- type: ya-git
16- #type: git
5+ type: git
176 source:
187 uri: ((git-id-osdn))@git.osdn.net:/gitroot/metasearch/grid-chef-repo.git
198 branch: master
209 paths:
2110 - cookbooks/((cookbook-name))
22- git_user: ((git-user-osdn))
2311 private_key: ((git-private-key))
12+ git_user: ((git-user-osdn))
2413 #check_every: 1h # default: 1m
2514 - name: chefdk-cache
2615 type: docker-image
@@ -79,7 +68,9 @@ jobs:
7968 params:
8069 depth: 5
8170 trigger: false
71+ passed: [test-cookbook]
8272 - get: chefdk-cache
73+ passed: [test-cookbook]
8374 - task: publish
8475 image: chefdk-cache
8576 params:
@@ -106,5 +97,4 @@ jobs:
10697 tag_prefix: ((cookbook-name))-
10798 tag: src-git/cookbooks/((cookbook-name))/version
10899 only_tag: true
109- annotate: src-git/cookbooks/((cookbook-name))/version
110- #annotate: # path to a file containing the annotation message.
100+ annotate: ../src-git/cookbooks/((cookbook-name))/version
--- a/cookbooks/chef_utils/fly-vars.yml
+++ b/cookbooks/chef_utils/fly-vars.yml
@@ -1,3 +1,3 @@
11 ---
22 cookbook-name: chef_utils
3-chefdk-version: 0.17.17
3+chefdk-version: 1.4.3
--- a/cookbooks/chef_utils/recipes/chef-client.rb
+++ b/cookbooks/chef_utils/recipes/chef-client.rb
@@ -19,6 +19,8 @@
1919
2020 ::Chef::Recipe.send(:include, ChefUtils::Helper)
2121
22+kernel_machine = node['kernel']['machine']
23+
2224 version = node['chef_utils']['chef-client']['version']
2325 release_url = node['chef_utils']['chef-client']['release_url']
2426 pkg_file = File.basename(release_url)
@@ -83,6 +85,7 @@ execute 'install_chef-client_by_omnitruck_installer' do
8385 user 'root'
8486 command "curl -L #{omnitruck_installer_url} | bash -s -- -v #{version}"
8587 action :nothing
88+ not_if { kernel_machine.start_with?('arm') }
8689 not_if expected_version unless force_install
8790 not_if "[ \"$(cat #{status_file})\" = '0' ]"
8891 end
--- a/cookbooks/chef_utils/recipes/chef-server-configuration.rb
+++ b/cookbooks/chef_utils/recipes/chef-server-configuration.rb
@@ -20,6 +20,7 @@
2020 force_override_config = node.force_override['chef_utils']['chef-server']['config']
2121
2222 if node['chef_utils']['chef-server']['with_ssl_cert_cookbook']
23+ include_recipe 'ssl_cert::server_key_pairs'
2324 ::Chef::Recipe.send(:include, SSLCert::Helper)
2425 cn = node['chef_utils']['chef-server']['ssl_cert']['common_name']
2526 force_override_config['nginx']['ssl_certificate'] = server_cert_path(cn)
--- a/cookbooks/chef_utils/version
+++ b/cookbooks/chef_utils/version
@@ -1 +1 @@
1-0.8.2
1+0.8.3
旧リポジトリブラウザで表示