adds default ports settings.

diff --git a/cookbooks/jenkins-grid/CHANGELOG.md b/cookbooks/jenkins-grid/CHANGELOG.md
index 53083e9..8ef824d 100644 (file)
--- a/cookbooks/jenkins-grid/CHANGELOG.md
+++ b/cookbooks/jenkins-grid/CHANGELOG.md
@@ -1,5 +1,9 @@
 # jenkins-grid CHANGELOG
 
+0.2.3
+-----
+- adds default ports settings.
+
 0.2.2
 -----
 - Bug fix: Docker volumes management.

diff --git a/cookbooks/jenkins-grid/metadata.rb b/cookbooks/jenkins-grid/metadata.rb
index d24ef2a..ddaf15c 100644 (file)
--- a/cookbooks/jenkins-grid/metadata.rb
+++ b/cookbooks/jenkins-grid/metadata.rb
@@ -5,7 +5,7 @@ maintainer_email ''
 license          'Apache 2.0'
 description      'Installs/Configures jenkins-grid'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.2.2'
+version          '0.2.3'
 source_url       'http://scm.osdn.jp/gitroot/metasearch/grid-chef-repo.git'
 issues_url       'https://osdn.jp/projects/metasearch/ticket'
 

diff --git a/cookbooks/jenkins-grid/recipes/docker-compose.rb b/cookbooks/jenkins-grid/recipes/docker-compose.rb
index d31e859..da54e16 100644 (file)
--- a/cookbooks/jenkins-grid/recipes/docker-compose.rb
+++ b/cookbooks/jenkins-grid/recipes/docker-compose.rb
@@ -2,7 +2,7 @@
 # Cookbook Name:: jenkins-grid
 # Recipe:: docker-compose
 #
-# Copyright 2016, whitestar
+# Copyright 2016-2017, whitestar
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -46,6 +46,9 @@ vols = config['services']['jenkins']['volumes'].to_a
   end
 }
 
+ports = config['services']['jenkins']['ports']
+override_config['services']['jenkins']['ports'] = ['8080:8080', '50000:50000'] if ports.empty?
+
 jenkins_owner = node['jenkins-grid']['docker-compose']['jenkins_home']['owner']
 jenkins_home_path = node['jenkins-grid']['docker-compose']['jenkins_home']['path']
 unless jenkins_home_path.nil?

diff --git a/roles/jenkins.rb b/roles/jenkins.rb
index 654e5d2..1fa2fe9 100644 (file)
--- a/roles/jenkins.rb
+++ b/roles/jenkins.rb
@@ -4,6 +4,7 @@ description 'Jenkins'
 run_list(
   #'recipe[ssl_cert::server_key_pairs]',
   'role[docker]',
+  'recipe[jenkins-grid::docker-compose]',
 )
 
 #env_run_lists()