From ecb4c7a608af204514efded89decf92d5c892b88 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 2 May 2019 18:39:22 +0100 Subject: [PATCH] Ensure that Drupal site directories are present --- defaults/main.yml | 2 +- molecule/default/playbook.yml | 5 +++++ molecule/default/tests/test_default.py | 10 ++++------ tasks/main.yml | 8 +++++++- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 336678f..cfd76d5 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,2 +1,2 @@ --- -# defaults file for opdavies.drupal-settings +drupal_settings: [] diff --git a/molecule/default/playbook.yml b/molecule/default/playbook.yml index 673d26e..9bf8514 100644 --- a/molecule/default/playbook.yml +++ b/molecule/default/playbook.yml @@ -1,5 +1,10 @@ --- - name: Converge hosts: all + vars: + drupal_settings: + - root: /var/www/test + sites: + - name: default roles: - role: opdavies.drupal-settings diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index eedd64a..6597435 100644 --- a/molecule/default/tests/test_default.py +++ b/molecule/default/tests/test_default.py @@ -5,10 +5,8 @@ import testinfra.utils.ansible_runner testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all') +def test_drupal_site_directory_exists(host): + directory = host.file('/var/www/test/sites/default') -def test_hosts_file(host): - f = host.file('/etc/hosts') - - assert f.exists - assert f.user == 'root' - assert f.group == 'root' + assert directory.exists + assert directory.is_directory diff --git a/tasks/main.yml b/tasks/main.yml index 7e18612..fb395ec 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,2 +1,8 @@ --- -# tasks file for opdavies.drupal-settings +- name: Ensure that Drupal site directories are present + file: + state: directory + path: '{{ item.0.root }}/sites/{{ item.1.name|default("default") }}' + with_subelements: + - '{{ drupal_settings }}' + - sites