Skip to content

Commit 18068b5

Browse files
committed
Only create EBS volumes when running on Amazon
To enable development using vagrant.
1 parent a45d662 commit 18068b5

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

recipes/master-init.rb

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@
1010

1111
include_recipe "java"
1212

13-
# EBS -- must come before jenkins init since it mounts /var/lib/jenkins
14-
include_recipe "scala-jenkins-infra::_config-ebs"
13+
case node["platform"]
14+
when "amazon"
15+
# EBS -- must come before jenkins init since it mounts /var/lib/jenkins
16+
include_recipe "scala-jenkins-infra::_config-ebs"
17+
end
1518

1619
include_recipe "scala-jenkins-infra::_master-init-jenkins"
1720

recipes/worker-config.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
# since jenkins's home dir is mounted on ephemeral storage (see chef/userdata/ubuntu-publish-c3.xlarge)
1313

1414

15-
include_recipe "scala-jenkins-infra::_config-ebs"
15+
case node["platform"]
16+
when "amazon"
17+
include_recipe "scala-jenkins-infra::_config-ebs"
18+
end
1619

1720
node["jenkinsHomes"].each do |jenkinsHome, workerConfig|
1821
case node["platform_family"]

0 commit comments

Comments
 (0)