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

---
 .yamllint                     |  6 ++++++
 molecule/default/converge.yml | 23 +++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 .yamllint
 create mode 100644 molecule/default/converge.yml

diff --git a/.yamllint b/.yamllint
new file mode 100644
index 0000000..a3dbc38
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
new file mode 100644
index 0000000..ab33866
--- /dev/null
+++ b/molecule/default/converge.yml
@@ -0,0 +1,23 @@
+---
+- 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