Update molecule configuration to work with 3.0.

pull/102/head
Jeff Geerling 5 years ago
parent 6e17af0ac5
commit 57702b3544
  1. 2
      .travis.yml
  2. 13
      molecule/default/molecule.yml
  3. 27
      molecule/default/playbook.yml
  4. 6
      molecule/default/yaml-lint.yml

@ -16,7 +16,7 @@ env:
install: install:
# Install test dependencies. # Install test dependencies.
- pip install molecule docker - pip install molecule yamllint ansible-lint docker
before_script: before_script:
# Use actual Ansible Galaxy role name for the project directory. # Use actual Ansible Galaxy role name for the project directory.

@ -4,9 +4,8 @@ dependency:
driver: driver:
name: docker name: docker
lint: lint:
name: yamllint yamllint .
options: ansible-lint
config-file: molecule/default/yaml-lint.yml
platforms: platforms:
- name: instance - name: instance
image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest" image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@ -17,13 +16,7 @@ platforms:
pre_build_image: true pre_build_image: true
provisioner: provisioner:
name: ansible name: ansible
lint:
name: ansible-lint
playbooks: playbooks:
converge: ${MOLECULE_PLAYBOOK:-playbook.yml} converge: ${MOLECULE_PLAYBOOK:-converge.yml}
scenario: scenario:
name: default name: default
verifier:
name: testinfra
lint:
name: flake8

@ -1,27 +0,0 @@
---
- name: Converge
hosts: all
become: true
vars:
certbot_auto_renew_user: root
pre_tasks:
- name: Update apt cache.
apt: update_cache=yes cache_valid_time=600
when: ansible_os_family == 'Debian'
changed_when: false
- name: Install dependencies (RedHat).
yum: name={{ item }} state=present
when: ansible_os_family == 'RedHat'
with_items:
- cronie
- epel-release
- name: Install cron (Debian).
apt: name=cron state=present
when: ansible_os_family == 'Debian'
roles:
- geerlingguy.certbot

@ -1,6 +0,0 @@
---
extends: default
rules:
line-length:
max: 120
level: warning
Loading…
Cancel
Save