From 83999c9f733c190859be9fc988dfcc9436f85062 Mon Sep 17 00:00:00 2001 From: paulfantom Date: Sun, 4 Jun 2017 11:32:57 +0200 Subject: [PATCH 1/2] enable tests in molecule --- molecule.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/molecule.yml b/molecule.yml index 483f062..f1edb4d 100644 --- a/molecule.yml +++ b/molecule.yml @@ -12,8 +12,8 @@ docker: image_version: xenial ansible_groups: - group1 -# - name: nginx-centos -# image: centos -# image_version: 7 -# ansible_groups: -# - group2 + - name: nginx-centos + image: centos + image_version: 7 + ansible_groups: + - group2 From 581f7c4f342b5084e42031e770d6d6171814b4a9 Mon Sep 17 00:00:00 2001 From: paulfantom Date: Sun, 4 Jun 2017 12:09:31 +0200 Subject: [PATCH 2/2] simplify inventory --- .gitignore | 4 ++++ README.md | 5 ----- meta/main.yml | 6 +++--- molecule.yml | 14 +++++++------- tests/inventory | 3 --- 5 files changed, 14 insertions(+), 18 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a427e3c --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.swp +*.swo +*.idea +.molecule diff --git a/README.md b/README.md index 10964a8..c6487f3 100644 --- a/README.md +++ b/README.md @@ -28,8 +28,3 @@ execution to remove previous Diffie-Hellman parameters Have a look at the [defaults/main.yml](defaults/main.yml) for role variables that can be overridden. - -TODO ----- - -- CentOS 7 support diff --git a/meta/main.yml b/meta/main.yml index 362ca77..5e5c555 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -6,9 +6,9 @@ galaxy_info: license: MIT min_ansible_version: 2.0 platforms: -# - name: EL -# versions: -# - 7 + - name: EL + versions: + - 7 - name: Ubuntu versions: - trusty diff --git a/molecule.yml b/molecule.yml index f1edb4d..5ccb7dd 100644 --- a/molecule.yml +++ b/molecule.yml @@ -7,13 +7,13 @@ verifier: name: testinfra docker: containers: - - name: nginx-ubuntu + - name: nginx-trusty + image: ubuntu + image_version: trusty + - name: nginx-xenial image: ubuntu image_version: xenial - ansible_groups: - - group1 - name: nginx-centos - image: centos - image_version: 7 - ansible_groups: - - group2 + image: centos/systemd + image_version: latest + privileged: true diff --git a/tests/inventory b/tests/inventory index 5d50087..2fbb50c 100644 --- a/tests/inventory +++ b/tests/inventory @@ -1,4 +1 @@ localhost -[group1] -docker -