Skip to content

Commit 2aea567

Browse files
committed
EBS volumes for master
1 parent 6c53abc commit 2aea567

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

attributes/master.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@
99
default['s3']['downloads']['host'] = "downloads.typesafe.com.s3.amazonaws.com"
1010

1111
if node.name == "jenkins-master"
12+
# EBS
13+
default['ebs']['volumes']['/var/lib/jenkins']['size'] = 100 # size of the volume correlates to speed (in IOPS)
14+
default['ebs']['volumes']['/var/lib/jenkins']['dev'] = "/dev/sdj"
15+
default['ebs']['volumes']['/var/lib/jenkins']['fstype'] = "ext4"
16+
default['ebs']['volumes']['/var/lib/jenkins']['user'] = "jenkins"
17+
default['ebs']['volumes']['/var/lib/jenkins']['mountopts'] = 'noatime'
18+
1219
# JAVA
1320
default['java']['jdk_version'] = '7'
1421
default['java']['install_flavor'] = 'openjdk'

recipes/_worker-config-ebs.rb renamed to recipes/_config-ebs.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Cookbook Name:: scala-jenkins-infra
3-
# Recipe:: _worker-config-ebs
3+
# Recipe:: _config-ebs
44
#
55
# Copyright 2014, Typesafe, Inc.
66
#

recipes/master-config.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
end
1616
end
1717

18+
include_recipe "scala-jenkins-infra::_config-ebs"
1819

1920
# nginx reverse proxy setup, in concert with JenkinsLocationConfiguration created in master-init
2021
include_recipe 'scala-jenkins-infra::_master-config-proxy'

recipes/worker-config.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
require 'chef-vault'
1515

16-
include_recipe "scala-jenkins-infra::_worker-config-ebs"
16+
include_recipe "scala-jenkins-infra::_config-ebs"
1717

1818
node["jenkinsHomes"].each do |jenkinsHome, workerConfig|
1919
case node["platform_family"]

0 commit comments

Comments
 (0)