Skip to content

Commit

Permalink
Merge pull request #47 from jupeter/jdk_configuration
Browse files Browse the repository at this point in the history
Add possible to set JDK version
  • Loading branch information
kristofkeppens authored Jun 15, 2016
2 parents 0a0fcd6 + 0390a39 commit dbaad8f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ email:
smtp_host: 'mail.example.com'
smtp_ssl: 'true'
default_email_suffix: '@example.com'
java_version: "openjdk-7"
```
### Run the playbook
Expand Down
1 change: 1 addition & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@ proxy_env:
https_proxy: "{{proxy_url}}"
no_proxy: "{{__no_proxy}}"
prefix: "/"
java_version: "openjdk-7"
# jenkins_admin_user: admin
# jenkins_admin_password: recommended to be put a vault file
4 changes: 2 additions & 2 deletions vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ jenkins:
deb:
repo: 'deb http://pkg.jenkins-ci.org/debian binary/' # Jenkins repository
dependencies: # Jenkins dependencies
- 'openjdk-7-jre'
- 'openjdk-7-jdk'
- '{{ java_version }}-jre'
- '{{ java_version }}-jdk'
- 'git'
- 'curl'
redhat:
Expand Down

0 comments on commit dbaad8f

Please sign in to comment.