From a8f65d8440c369b4720cef782e91dd7f3353d6c1 Mon Sep 17 00:00:00 2001 From: gregharvey Date: Mon, 13 Mar 2023 10:56:41 +0100 Subject: [PATCH] Ensuring we can prevent features and ctools deployments in Drupal 7. --- roles/_init/defaults/main.yml | 3 ++- roles/database_apply/database_apply-drupal7/tasks/main.yml | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/roles/_init/defaults/main.yml b/roles/_init/defaults/main.yml index b38c1e59..00d03c05 100644 --- a/roles/_init/defaults/main.yml +++ b/roles/_init/defaults/main.yml @@ -14,6 +14,7 @@ drupal: # End Drupal 8 variables # Drupal 7 variables revert_features_command: "" # i.e. "fra" + revert_ctools: true # End Drupal 7 variables sanitize_command: "sql-sanitize" base_url: https://www.example.com @@ -25,4 +26,4 @@ drupal: mautic: image_path: "media/images" force_install: false -bin_directory: "/home/{{ deploy_user }}/.bin" \ No newline at end of file +bin_directory: "/home/{{ deploy_user }}/.bin" diff --git a/roles/database_apply/database_apply-drupal7/tasks/main.yml b/roles/database_apply/database_apply-drupal7/tasks/main.yml index 70b21947..6b745c3b 100644 --- a/roles/database_apply/database_apply-drupal7/tasks/main.yml +++ b/roles/database_apply/database_apply-drupal7/tasks/main.yml @@ -44,10 +44,12 @@ loop_var: site when: - previous_build_number > 0 - - site.revert_features_command + - site.revert_features_command | length > 0 - name: Revert Drupal configuration with Ctools. ansible.builtin.include_tasks: ctools.yml with_items: "{{ drupal.sites }}" loop_control: loop_var: site + when: + - site.revert_ctools