From 62a339bdb50aa9bd663fe78b83dcaf077cfa986c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 20 Feb 2020 14:23:45 -0600
Subject: [PATCH] Update molecule configuration to work with 3.0.

---
 .travis.yml                    |  2 +-
 molecule/default/molecule.yml  | 13 +++----------
 molecule/default/playbook.yml  | 23 -----------------------
 molecule/default/yaml-lint.yml |  6 ------
 4 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 molecule/default/playbook.yml
 delete mode 100644 molecule/default/yaml-lint.yml

diff --git a/.travis.yml b/.travis.yml
index 7a81580..694160a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ env:
 
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 2ca6fea..f2e9611 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -4,9 +4,8 @@ dependency:
 driver:
   name: docker
 lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +16,7 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
 scenario:
   name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
diff --git a/molecule/default/playbook.yml b/molecule/default/playbook.yml
deleted file mode 100644
index ab33866..0000000
--- a/molecule/default/playbook.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: true
-
-  vars:
-    php_enable_webserver: false
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=true cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-
-  roles:
-    - role: geerlingguy.repo-remi
-      when: ansible_os_family == 'RedHat'
-    - role: geerlingguy.php-versions
-    - role: geerlingguy.php
-
-  post_tasks:
-    - name: Confirm PHP version is correct.
-      shell: php -v | grep -F '{{ php_version }}'
-      changed_when: false
diff --git a/molecule/default/yaml-lint.yml b/molecule/default/yaml-lint.yml
deleted file mode 100644
index a3dbc38..0000000
--- a/molecule/default/yaml-lint.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-extends: default
-rules:
-  line-length:
-    max: 120
-    level: warning