OSDN Git Service
(root)
/
metasearch
/
grid-chef-repo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
954f139
)
improves server key pair deployment.
jenkins-grid-0.2.8
author
whitestar
<whitestar@users.osdn.me>
Tue, 5 Sep 2017 13:26:05 +0000
(22:26 +0900)
committer
whitestar
<whitestar@users.osdn.me>
Tue, 5 Sep 2017 13:26:05 +0000
(22:26 +0900)
cookbooks/jenkins-grid/CHANGELOG.md
patch
|
blob
|
history
cookbooks/jenkins-grid/README.md
patch
|
blob
|
history
cookbooks/jenkins-grid/metadata.rb
patch
|
blob
|
history
cookbooks/jenkins-grid/recipes/docker-compose.rb
patch
|
blob
|
history
cookbooks/jenkins-grid/version
patch
|
blob
|
history
diff --git
a/cookbooks/jenkins-grid/CHANGELOG.md
b/cookbooks/jenkins-grid/CHANGELOG.md
index
9d08838
..
1fa286e
100644
(file)
--- a/
cookbooks/jenkins-grid/CHANGELOG.md
+++ b/
cookbooks/jenkins-grid/CHANGELOG.md
@@
-1,5
+1,9
@@
# jenkins-grid CHANGELOG
# jenkins-grid CHANGELOG
+0.2.8
+-----
+- improves server key pair deployment.
+
0.2.7
-----
- improves SSL server key management.
0.2.7
-----
- improves SSL server key management.
diff --git
a/cookbooks/jenkins-grid/README.md
b/cookbooks/jenkins-grid/README.md
index
d9f471f
..
ccee203
100644
(file)
--- a/
cookbooks/jenkins-grid/README.md
+++ b/
cookbooks/jenkins-grid/README.md
@@
-105,7
+105,7
@@
name 'jenkins-with-ssl-cert'
description 'Jenkins setup with ssl_cert cookbook'
run_list(
description 'Jenkins setup with ssl_cert cookbook'
run_list(
- #'recipe[ssl_cert::server_key_pairs]', # jenkins-grid
<= 0.2.3
+ #'recipe[ssl_cert::server_key_pairs]', # jenkins-grid
cookbook < 0.2.4
'role[docker]',
'recipe[jenkins-grid::docker-compose]',
)
'role[docker]',
'recipe[jenkins-grid::docker-compose]',
)
@@
-117,6
+117,11
@@
run_list(
jenkins_cn = 'jenkins.io.example.com'
override_attributes(
jenkins_cn = 'jenkins.io.example.com'
override_attributes(
+ 'ssl_cert' => {
+ #'common_names' => [
+ # jenkins_cn, # jenkins-grid cookbook < 0.2.8
+ #],
+ },
'jenkins-grid' => {
'with_ssl_cert_cookbook' => true,
'ssl_cert' => {
'jenkins-grid' => {
'with_ssl_cert_cookbook' => true,
'ssl_cert' => {
@@
-156,11
+161,6
@@
override_attributes(
},
},
},
},
},
},
- 'ssl_cert' => {
- 'common_names' => [
- jenkins_cn,
- ],
- }
)
```
)
```
@@
-195,15
+195,15
@@
$ knife vault update ssl_server_certs jenkins.io.example.com.prod -S 'name:jenki
```ruby
run_list(
```ruby
run_list(
- #'recipe[ssl_cert::server_key_pairs]', # jenkins-grid <
= 0.2.3
+ #'recipe[ssl_cert::server_key_pairs]', # jenkins-grid <
0.2.4
'recipe[jenkins-grid::docker-compose]',
)
override_attributes(
'ssl_cert' => {
'recipe[jenkins-grid::docker-compose]',
)
override_attributes(
'ssl_cert' => {
- 'common_names' => [
- 'jenkins.io.example.com',
- ],
+
#
'common_names' => [
+ # 'jenkins.io.example.com', # jenkins-grid cookbook < 0.2.8
+
#
],
},
'jenkins-grid' => {
'with_ssl_cert_cookbook' => true,
},
'jenkins-grid' => {
'with_ssl_cert_cookbook' => true,
diff --git
a/cookbooks/jenkins-grid/metadata.rb
b/cookbooks/jenkins-grid/metadata.rb
index
e6e39e8
..
4497011
100644
(file)
--- a/
cookbooks/jenkins-grid/metadata.rb
+++ b/
cookbooks/jenkins-grid/metadata.rb
@@
-18,4
+18,4
@@
supports 'ubuntu', '>= 14.04'
end
depends 'docker-grid', '>= 0.3.6'
end
depends 'docker-grid', '>= 0.3.6'
-depends 'ssl_cert', '>= 0.
3.3
'
+depends 'ssl_cert', '>= 0.
4.1
'
diff --git
a/cookbooks/jenkins-grid/recipes/docker-compose.rb
b/cookbooks/jenkins-grid/recipes/docker-compose.rb
index
ce1fbf2
..
8fd0d3f
100644
(file)
--- a/
cookbooks/jenkins-grid/recipes/docker-compose.rb
+++ b/
cookbooks/jenkins-grid/recipes/docker-compose.rb
@@
-70,9
+70,10
@@
unless jenkins_home_path.nil?
end
if node['jenkins-grid']['with_ssl_cert_cookbook']
end
if node['jenkins-grid']['with_ssl_cert_cookbook']
- include_recipe 'ssl_cert::server_key_pairs'
::Chef::Recipe.send(:include, SSLCert::Helper)
cn = node['jenkins-grid']['ssl_cert']['common_name']
::Chef::Recipe.send(:include, SSLCert::Helper)
cn = node['jenkins-grid']['ssl_cert']['common_name']
+ append_server_ssl_cn(cn)
+ include_recipe 'ssl_cert::server_key_pairs'
key_path = server_key_path(cn)
bash 'copy_ssl_server_key_for_jenkins' do
key_path = server_key_path(cn)
bash 'copy_ssl_server_key_for_jenkins' do
diff --git
a/cookbooks/jenkins-grid/version
b/cookbooks/jenkins-grid/version
index
b003284
..
a45be46
100644
(file)
--- a/
cookbooks/jenkins-grid/version
+++ b/
cookbooks/jenkins-grid/version
@@
-1
+1
@@
-0.2.
7
+0.2.
8