diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-07-02 10:14:07 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-07-02 07:18:32 +0200 |
| commit | a8c4817fc7f5b8c2d0ec13ae48963dc58384b51b (patch) | |
| tree | ad6888a0180d961661c7fb20747e209601b790dd /puppet/modules/java | |
| parent | d239e8a4cec3d3016c79961e2b044a77f0501095 (diff) | |
Added new module, jenkins_slave.
jenkins_slave deploys a jenkins node on Windows or Linux.
The slave name is equal to the fqdn of the test machine and must be
pre-configured in the jenkins master before this module can be used.
The Windows implementation required some minor refactoring and the
addition of an implementation of the 'startup' defined type on Windows.
The installation of the Java virtual machine was split into a separate
module, since both Pulse and Jenkins depend on this.
Note that no nodes are yet assigned as Jenkins slaves.
Change-Id: I23e14564e2bd65fda607527107f4d7b6e7aea5e0
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Diffstat (limited to 'puppet/modules/java')
| -rw-r--r-- | puppet/modules/java/manifests/init.pp | 5 | ||||
| -rw-r--r-- | puppet/modules/java/manifests/ubuntu.pp | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/puppet/modules/java/manifests/init.pp b/puppet/modules/java/manifests/init.pp new file mode 100644 index 0000000..9feb8c3 --- /dev/null +++ b/puppet/modules/java/manifests/init.pp @@ -0,0 +1,5 @@ +class java { + case $operatingsystem { + Ubuntu: { include java::ubuntu } + } +} diff --git a/puppet/modules/java/manifests/ubuntu.pp b/puppet/modules/java/manifests/ubuntu.pp new file mode 100644 index 0000000..345c35f --- /dev/null +++ b/puppet/modules/java/manifests/ubuntu.pp @@ -0,0 +1,4 @@ +class java::ubuntu { + package { "default-jre": ensure => installed; } +} + |