Grid環境構築用のChefリポジトリです。
Revisión | a09148e1d6d373c43e0f86605e0aa5e9263e4465 (tree) |
---|---|
Tiempo | 2017-08-23 22:40:56 |
Autor | whitestar <whitestar@user...> |
Commiter | whitestar |
includes the ssl_cert::server_key_pairs recipe in the chef_utils::chef-server-configuration recipe automatically.
@@ -1,6 +1,11 @@ | ||
1 | 1 | CHANGELOG for chef_utils |
2 | 2 | ========================= |
3 | 3 | |
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 | + | |
4 | 9 | 0.8.2 |
5 | 10 | ----- |
6 | 11 | - adds the Concourse pipeline configuration. |
@@ -1,26 +1,15 @@ | ||
1 | 1 | --- |
2 | 2 | # $ 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 | - | |
13 | 3 | resources: |
14 | 4 | - name: src-git |
15 | - type: ya-git | |
16 | - #type: git | |
5 | + type: git | |
17 | 6 | source: |
18 | 7 | uri: ((git-id-osdn))@git.osdn.net:/gitroot/metasearch/grid-chef-repo.git |
19 | 8 | branch: master |
20 | 9 | paths: |
21 | 10 | - cookbooks/((cookbook-name)) |
22 | - git_user: ((git-user-osdn)) | |
23 | 11 | private_key: ((git-private-key)) |
12 | + git_user: ((git-user-osdn)) | |
24 | 13 | #check_every: 1h # default: 1m |
25 | 14 | - name: chefdk-cache |
26 | 15 | type: docker-image |
@@ -79,7 +68,9 @@ jobs: | ||
79 | 68 | params: |
80 | 69 | depth: 5 |
81 | 70 | trigger: false |
71 | + passed: [test-cookbook] | |
82 | 72 | - get: chefdk-cache |
73 | + passed: [test-cookbook] | |
83 | 74 | - task: publish |
84 | 75 | image: chefdk-cache |
85 | 76 | params: |
@@ -106,5 +97,4 @@ jobs: | ||
106 | 97 | tag_prefix: ((cookbook-name))- |
107 | 98 | tag: src-git/cookbooks/((cookbook-name))/version |
108 | 99 | 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 |
@@ -1,3 +1,3 @@ | ||
1 | 1 | --- |
2 | 2 | cookbook-name: chef_utils |
3 | -chefdk-version: 0.17.17 | |
3 | +chefdk-version: 1.4.3 |
@@ -19,6 +19,8 @@ | ||
19 | 19 | |
20 | 20 | ::Chef::Recipe.send(:include, ChefUtils::Helper) |
21 | 21 | |
22 | +kernel_machine = node['kernel']['machine'] | |
23 | + | |
22 | 24 | version = node['chef_utils']['chef-client']['version'] |
23 | 25 | release_url = node['chef_utils']['chef-client']['release_url'] |
24 | 26 | pkg_file = File.basename(release_url) |
@@ -83,6 +85,7 @@ execute 'install_chef-client_by_omnitruck_installer' do | ||
83 | 85 | user 'root' |
84 | 86 | command "curl -L #{omnitruck_installer_url} | bash -s -- -v #{version}" |
85 | 87 | action :nothing |
88 | + not_if { kernel_machine.start_with?('arm') } | |
86 | 89 | not_if expected_version unless force_install |
87 | 90 | not_if "[ \"$(cat #{status_file})\" = '0' ]" |
88 | 91 | end |
@@ -20,6 +20,7 @@ | ||
20 | 20 | force_override_config = node.force_override['chef_utils']['chef-server']['config'] |
21 | 21 | |
22 | 22 | if node['chef_utils']['chef-server']['with_ssl_cert_cookbook'] |
23 | + include_recipe 'ssl_cert::server_key_pairs' | |
23 | 24 | ::Chef::Recipe.send(:include, SSLCert::Helper) |
24 | 25 | cn = node['chef_utils']['chef-server']['ssl_cert']['common_name'] |
25 | 26 | force_override_config['nginx']['ssl_certificate'] = server_cert_path(cn) |
@@ -1 +1 @@ | ||
1 | -0.8.2 | |
1 | +0.8.3 |