Explorar el Código

Merge pull request #534 from carljm/ntp-workaround

Workaround bug with enabling SysV init scripts on Jessie.
Sven Neuhaus hace 8 años
padre
commit
e0dc103581
Se han modificado 2 ficheros con 13 adiciones y 4 borrados
  1. 6
    2
      roles/common/tasks/ntp.yml
  2. 7
    2
      roles/monitoring/tasks/collectd.yml

+ 6
- 2
roles/common/tasks/ntp.yml Ver fichero

@@ -11,6 +11,10 @@
11 11
   notify:
12 12
     - restart ntp
13 13
 
14
-- name: Ensure ntpd is running and enabled
15
-  service: name=ntp state=started enabled=yes
14
+- name: Ensure ntpd is running
15
+  service: name=ntp state=started
16 16
 
17
+# Work around https://github.com/ansible/ansible-modules-core/issues/915
18
+# otherwise we'd use enabled=yes in previous task
19
+- name: Ensure ntp is enabled
20
+  command: update-rc.d ntp enable creates=/etc/rc3.d/S03ntp

+ 7
- 2
roles/monitoring/tasks/collectd.yml Ver fichero

@@ -5,5 +5,10 @@
5 5
   template: src=etc_collectd_collectd.conf.j2 dest=/etc/collectd/collectd.conf
6 6
   notify: restart collectd
7 7
 
8
-- name: Ensure collectd is a system service
9
-  service: name=collectd state=started enabled=true
8
+- name: Ensure collectd is started
9
+  service: name=collectd state=started
10
+
11
+# Work around https://github.com/ansible/ansible-modules-core/issues/915
12
+# otherwise we'd use enabled=yes in previous task
13
+- name: Ensure collectd is enabled
14
+  command: update-rc.d collectd enable creates=/etc/rc3.d/S03collectd

Loading…
Cancelar
Guardar