Skip to content
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ansible/roles/baselayout/tasks/partials/ntp/ntp_package.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---

#
# enable/start the os-bundled ntpd
#
# package and service are 'ntp' but 'ntpd' is started
#

- name: install ntpd
package: name=ntp state=present

This comment was marked as off-topic.

This comment was marked as off-topic.


- name: start ntpd
service: name=ntp state=started enabled=yes
3 changes: 2 additions & 1 deletion ansible/roles/baselayout/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ git_version: 2.10.2
ssh_config: /etc/ssh/sshd_config

ntp_service: {
systemd: ['debian8', 'ubuntu1404', 'ubuntu1604', 'ubuntu1610']
systemd: ['debian8', 'ubuntu1604', 'ubuntu1610'],
ntp_package: ['ubuntu1404']
}

common_packages: [
Expand Down
5 changes: 2 additions & 3 deletions ansible/roles/java-base/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
# installs java
#

- name: install java
package: name="{{ java_package_name }}" state=present
# if this fails you want to check in vars/main.yml and add package name
# as appropriate -- try to use generic os family if available.
failed_when: "'{{ java_package_name }}' == 'missing'"
- name: install java
package: name="{{ java_package_name }}" state=present

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

1 change: 1 addition & 0 deletions ansible/roles/java-base/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ packages: {
'freebsd': 'openjdk8-jre',
'smartos': 'openjdk8',
'ubuntu': 'openjdk-8-jre-headless',
'ubuntu1404': 'openjdk-7-jre-headless',

This comment was marked as off-topic.

This comment was marked as off-topic.

}

java_package_name: "{{ packages[os]|default(packages[os|stripversion])|default('missing') }}"
4 changes: 2 additions & 2 deletions ansible/roles/jenkins-worker/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ init: {
debian: ['debian7', 'ubuntu1204'],
freebsd: 'freebsd',
openrc: 'alpine',
systemd: ['centos7', 'debian8', 'fedora', 'ubuntu1404', 'ubuntu1604',
systemd: ['centos7', 'debian8', 'fedora', 'ubuntu1604',
'ubuntu1610'],
svc: 'smartos',
upstart: 'ubuntu12'
upstart: ['ubuntu12', 'ubuntu1404']
}

jenkins_init: {
Expand Down