From b6455eefd0709cf8bac67a254c2e5a7913370eb3 Mon Sep 17 00:00:00 2001 From: Jan Benedikt Date: Tue, 17 Mar 2020 11:31:39 +0100 Subject: Adding Ubuntu support in Ansible - docker role Extending ansible playbooks of ubuntu support. Creating new test with Ubuntu image for Molecule in docker role. Issue-ID: OOM-1671 Signed-off-by: Jan Benedikt Change-Id: I4786dcd4b2de3f8d189db3b619c3d75315302506 --- ansible/roles/docker/molecule/default/molecule.yml | 2 ++ .../roles/docker/molecule/default/tests/test_default.py | 17 +++++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'ansible/roles/docker/molecule/default') diff --git a/ansible/roles/docker/molecule/default/molecule.yml b/ansible/roles/docker/molecule/default/molecule.yml index 1e800ee9..efa7f0ae 100644 --- a/ansible/roles/docker/molecule/default/molecule.yml +++ b/ansible/roles/docker/molecule/default/molecule.yml @@ -29,6 +29,8 @@ provisioner: host_vars: infrastructure-server: cluster_ip: 1.2.3.4 +scenario: + name: default verifier: name: testinfra options: diff --git a/ansible/roles/docker/molecule/default/tests/test_default.py b/ansible/roles/docker/molecule/default/tests/test_default.py index a8adeb65..a73572fd 100644 --- a/ansible/roles/docker/molecule/default/tests/test_default.py +++ b/ansible/roles/docker/molecule/default/tests/test_default.py @@ -1,5 +1,6 @@ import os import pytest +import json import testinfra.utils.ansible_runner @@ -23,13 +24,9 @@ def test_docker_daemon_file(host): assert f.exists assert f.user == 'root' assert f.group == 'root' - assert f.content_string == """{ - "log-opts": { - "max-size": "100m", - "max-file": "3" - }, - "dns": [ - "1.2.3.4" - ], - "log-driver": "json-file" -}""" + print(f.content_string) + json_data = json.loads(f.content_string) + assert json_data["log-driver"] == "json-file" + assert json_data["log-opts"]["max-size"] == "100m" + assert json_data["log-opts"]["max-file"] == "3" + assert json_data["dns"][0] == "1.2.3.4" -- cgit 1.2.3-korg