Merge pull request #184 from YPCrumble/feature/upgrade-molecule

Upgrade Molecule to v3.3.4.

molecule/default/molecule.yml

@@ -3,8 +3,8 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
+lint: |
+  yamllint .
 platforms:
   - name: instance-xenial
     image: ubuntu
@@ -20,8 +20,6 @@ provisioner:
     name: ansible-lint
   env:
     ANSIBLE_ROLES_PATH: ../../roles/
-scenario:
-  name: default
 verifier:
   name: testinfra
   lint:

requirements-dev.txt

@@ -1,4 +1,6 @@
 -r requirements.txt
 
-docker==3.6.0
-molecule==2.22.0
+molecule==3.3.4
+molecule-docker==0.2.4
+testinfra==3.2.1
+yamllint==1.19.0

requirements.txt

@@ -1 +1 @@
-ansible==2.9.20
+ansible==4.2.0

roles/celery/tasks/setup_supervisor.yml

@@ -1,7 +1,14 @@
 ---
 
 - name: Ensure the Supervisor service is running
-  service: name=supervisor state=started enabled=yes
+  service:
+    name: supervisor
+    state: started
+    enabled: yes
+    # TODO: This is likely due to a bug in Ansible.
+    # Remove this line in the future.
+    # See https://github.com/ansible/ansible/issues/75005
+    use: sysvinit
 
 - name: Create the Supervisor config file for {{ celery_application_name }}
   template: src=supervisor_{{ celery_application_name }}.conf.j2

roles/db/tasks/main.yml

@@ -23,7 +23,14 @@
   tags: packages
 
 - name: Ensure the PostgreSQL service is running
-  service: name=postgresql state=started enabled=yes
+  service:
+    name: postgresql
+    state: started
+    enabled: yes
+    # TODO: This is likely due to a bug in Ansible.
+    # Remove this line in the future.
+    # See https://github.com/ansible/ansible/issues/75005
+    use: sysvinit
 
 - name: Ensure database is created
   become: true

roles/memcached/tasks/main.yml

@@ -13,4 +13,11 @@
     - restart memcached
 
 - name: Ensure the Memcached service is running
-  service: name=memcached state=started enabled=yes
+  service:
+    name: memcached
+    state: started
+    enabled: yes
+    # TODO: This is likely due to a bug in Ansible.
+    # Remove this line in the future.
+    # See https://github.com/ansible/ansible/issues/75005
+    use: sysvinit

roles/nginx/tasks/main.yml

@@ -35,4 +35,11 @@
   notify: reload nginx
 
 - name: Ensure Nginx service is started
-  service: name=nginx state=started enabled=yes
+  service:
+    name: nginx
+    state: started
+    enabled: yes
+    # TODO: This is likely due to a bug in Ansible.
+    # Remove this line in the future.
+    # See https://github.com/ansible/ansible/issues/75005
+    use: sysvinit

roles/rabbitmq/handlers/main.yml

@@ -1,4 +1,6 @@
 ---
 
 - name: restart rabbitmq-server
-  service: name=rabbitmq-server state=restarted
+  service:
+    name: rabbitmq-server
+    state: restarted

roles/rabbitmq/tasks/main.yml

@@ -28,19 +28,20 @@
   tags:
     - packages
 
-- name: Enable the RabbitMQ Management Console
-  rabbitmq_plugin: names=rabbitmq_management state=enabled
-  notify: restart rabbitmq-server
-
 - name: Make sure rabbitmq-server is enabled and running
   service:
     name: rabbitmq-server
     state: started
     enabled: true
+    # TODO: This is likely due to a bug in Ansible.
+    # Remove this line in the future.
+    # See https://github.com/ansible/ansible/issues/75005
+    use: sysvinit
+
+- name: Enable the RabbitMQ Management Console
+  rabbitmq_plugin: names=rabbitmq_management state=enabled
+  notify: restart rabbitmq-server
 
 - include: setup_vhosts.yml
 
 - include: setup_users.yml
-
-- name: Ensure that the RabbitMQ service is running
-  service: name=rabbitmq-server state=started enabled=yes

roles/web/tasks/setup_supervisor.yml

@@ -1,7 +1,14 @@
 ---
 
 - name: Ensure the Supervisor service is running
-  service: name=supervisor state=started enabled=yes
+  service:
+    name: supervisor
+    state: started
+    enabled: yes
+    # TODO: This is likely due to a bug in Ansible.
+    # Remove this line in the future.
+    # See https://github.com/ansible/ansible/issues/75005
+    use: sysvinit
 
 - name: Create the Supervisor config file
   template: src=supervisor_config.j2