From 8626b025cff113c6ed9966b5482df777cc1102ea Mon Sep 17 00:00:00 2001
From: Fabian Weisshaar <elnappo@nerdpol.io>
Date: Thu, 19 Mar 2020 14:26:41 +0100
Subject: [PATCH] Updates for molecule 3.0

---
 .travis.yml                                     |  2 +-
 .yamllint                                       |  1 +
 molecule/default/{playbook.yml => converge.yml} |  0
 molecule/default/molecule.yml                   | 13 +++++--------
 molecule/default/prepare.yml                    |  2 ++
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename molecule/default/{playbook.yml => converge.yml} (100%)

diff --git a/.travis.yml b/.travis.yml
index f5611cd..d77fc69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ env:
 
 install:
   - sudo modprobe ip6_tables
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint flake8 docker pytest testinfra
 
 script:
   - molecule test
diff --git a/.yamllint b/.yamllint
index 3a2255e..8bb60ab 100644
--- a/.yamllint
+++ b/.yamllint
@@ -1,3 +1,4 @@
+---
 extends: default
 
 rules:
diff --git a/molecule/default/playbook.yml b/molecule/default/converge.yml
similarity index 100%
rename from molecule/default/playbook.yml
rename to molecule/default/converge.yml
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 73e01c5..fd48870 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -3,8 +3,11 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
+  flake8
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
@@ -17,11 +20,5 @@ provisioner:
   name: ansible
   playbooks:
     prepare: prepare.yml
-  lint:
-    name: ansible-lint
-scenario:
-  name: default
 verifier:
   name: testinfra
-  lint:
-    name: flake8
diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
index 4403ef9..0f553bb 100644
--- a/molecule/default/prepare.yml
+++ b/molecule/default/prepare.yml
@@ -23,6 +23,8 @@
         update_cache: true
         state: latest
       when: ansible_os_family == 'RedHat'
+      tags:
+        - skip_ansible_lint
 
     - name: Install dependencies
       package: