From 75795c532d7d90645385a929b8726fe837061019 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Thu, 15 Dec 2016 18:47:25 +0200
Subject: [PATCH] - More correct assertions. - Can't run systemd-timesyncd in a
container, for now removing from testing using Docker.
---
molecule.yml | 11 -----------
tasks/main.yml | 5 ++++-
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/molecule.yml b/molecule.yml
index 3911692..a71ec14 100644
--- a/molecule.yml
+++ b/molecule.yml
@@ -32,17 +32,6 @@ vagrant:
docker:
containers:
- - name: ntp-client-jessie
- image: debian
- image_version: jessie
- command: /sbin/init
- privileged: True
- volume_mounts:
- - /sys/fs/cgroup:/sys/fs/cgroup
- - /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket
- environment:
- DEBIAN_FRONTEND: noninteractive
- container: docker
- name: ntp-client-trusty
image: ubuntu-upstart
image_version: trusty
diff --git a/tasks/main.yml b/tasks/main.yml
index 30acc1b..2b8d2e0 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,7 +3,10 @@
- name: Assertions
assert:
- that: ansible_os_family in [ 'Debian', 'OpenBSD' ]
+ that:
+ - ansible_os_family in ntpd_conf
+ - ansible_os_family in ntp_pool
+ - ansible_os_family in ntpd_service
- name: apt install
when: ansible_pkg_mgr == 'apt' and not ansible_service_mgr == 'systemd'
--
GitLab