ansible: support for Ubuntu 14.04

joaocgreis · joaocgreis · commit 40c5b74142c6 · 2017-05-25T02:39:11.000+01:00
diff --git a/ansible/roles/baselayout/tasks/partials/ntp/ntp_package.yml b/ansible/roles/baselayout/tasks/partials/ntp/ntp_package.yml
@@ -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
+
+- name: start ntpd
+  service: name=ntp state=started enabled=yes
diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml
@@ -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: [
diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml
@@ -14,6 +14,7 @@ packages: {
   'freebsd': 'openjdk8-jre',
   'smartos': 'openjdk8',
   'ubuntu': 'openjdk-8-jre-headless',
+  'ubuntu1404': 'openjdk-7-jre-headless',
   }
 
 java_package_name: "{{ packages[os]|default(packages[os|stripversion])|default('missing') }}"
diff --git a/ansible/roles/jenkins-worker/vars/main.yml b/ansible/roles/jenkins-worker/vars/main.yml
@@ -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: {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@ git_version: 2.10.2`
`15`	`15`	`ssh_config: /etc/ssh/sshd_config`
`16`	`16`
`17`	`17`	`ntp_service: {`
`18`		`- systemd: ['debian8', 'ubuntu1404', 'ubuntu1604', 'ubuntu1610']`
	`18`	`+ systemd: ['debian8', 'ubuntu1604', 'ubuntu1610'],`
	`19`	`+ ntp_package: ['ubuntu1404']`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`common_packages: [`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ packages: {`
`14`	`14`	`'freebsd': 'openjdk8-jre',`
`15`	`15`	`'smartos': 'openjdk8',`
`16`	`16`	`'ubuntu': 'openjdk-8-jre-headless',`
	`17`	`+ 'ubuntu1404': 'openjdk-7-jre-headless',`
`17`	`18`	`}`
`18`	`19`
`19`	`20`	`java_package_name: "{{ packages[os]\|default(packages[os\|stripversion])\|default('missing') }}"`