diff --git a/roles/database_apply/database_apply-drupal7/tasks/ctools.yml b/roles/database_apply/database_apply-drupal7/tasks/ctools.yml index ce4db921..194226fa 100644 --- a/roles/database_apply/database_apply-drupal7/tasks/ctools.yml +++ b/roles/database_apply/database_apply-drupal7/tasks/ctools.yml @@ -1,8 +1,12 @@ --- - name: Check if Ctools module is enabled. - shell: "cd {{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }} &&{{ drush_bin }}pm-info ctools | grep ': enabled' | wc -l" + ansible.builtin.shell: + cmd: "{{ drush_bin }} pm-info ctools | grep ': enabled' | wc -l" + chdir: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}" register: ctools_enabled - name: Revert Drupal configuration from Ctools. - shell: "cd {{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }} &&{{ drush_bin }}-y ctools-export-revert --all" + ansible.builtin.command: + cmd: "{{ drush_bin }} -y ctools-export-revert --all" + chdir: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}" when: ctools_enabled.stdout == "1" diff --git a/roles/sync/database_sync/database_sync-mysql/tasks/main.yml b/roles/sync/database_sync/database_sync-mysql/tasks/main.yml index 11a47d5a..63edc494 100644 --- a/roles/sync/database_sync/database_sync-mysql/tasks/main.yml +++ b/roles/sync/database_sync/database_sync-mysql/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Sync database. - include_tasks: "sync.yml" + ansible.builtin.include_tasks: "sync.yml" with_items: "{{ mysql_sync.databases }}" loop_control: loop_var: database diff --git a/roles/sync/database_sync/database_sync-mysql/tasks/sync.yml b/roles/sync/database_sync/database_sync-mysql/tasks/sync.yml index 98eca0f3..29100ab5 100644 --- a/roles/sync/database_sync/database_sync-mysql/tasks/sync.yml +++ b/roles/sync/database_sync/database_sync-mysql/tasks/sync.yml @@ -36,11 +36,11 @@ - database.target.asg | length > 0 - name: Register remote dump name (from database). - set_fact: + ansible.builtin.set_fact: mysql_sync_source_dump_path: "/tmp/{{ database.source.database }}.sql.bz2" - name: Get source last known good build number. - command: + ansible.builtin.command: argv: - "/bin/sh" - "{{ _ce_deploy_base_dir }}/scripts/track-get.sh" @@ -51,17 +51,17 @@ when: database.source.type == 'rolling' - name: Register source database name. - set_fact: + ansible.builtin.set_fact: mysql_sync_source_database: "{{ database.source.database }}_{{ mysql_sync_source_build_number.stdout }}" when: database.source.type == 'rolling' - name: Register source database name. - set_fact: + ansible.builtin.set_fact: mysql_sync_source_database: "{{ database.source.database }}" when: not database.source.type == 'rolling' - name: Take a dump from source database. - shell: "mysqldump --defaults-extra-file={{ database.source.credentials_file }} {{ mysql_sync.mysqldump_params }} {{ mysql_sync_source_database }} | bzip2 > {{ mysql_sync_source_dump_path }}" + ansible.builtin.shell: "mysqldump --defaults-extra-file={{ database.source.credentials_file }} {{ mysql_sync.mysqldump_params }} {{ mysql_sync_source_database }} | bzip2 > {{ mysql_sync_source_dump_path }}" delegate_to: "{{ database.source.host }}" when: - database.source.fresh_db @@ -88,11 +88,11 @@ when: not database.source.fresh_db - name: Register tmp target dump name. - set_fact: + ansible.builtin.set_fact: mysql_sync_target_dump_path: "/tmp/{{ database.target.database }}.sql.bz2" - name: Get target last known good build number. - command: + ansible.builtin.command: argv: - "/bin/sh" - "{{ _ce_deploy_base_dir }}/scripts/track-get.sh" @@ -103,38 +103,40 @@ when: database.target.type == 'rolling' - name: Register target database name. - set_fact: + ansible.builtin.set_fact: mysql_sync_target_database: "{{ database.target.database }}_{{ mysql_sync_target_build_number.stdout }}" when: database.target.type == 'rolling' - name: Register target database name. - set_fact: + ansible.builtin.set_fact: mysql_sync_target_database: "{{ database.target.database }}" when: not database.target.type == 'rolling' - name: Fetch dump file. - fetch: + ansible.builtin.fetch: src: "{{ mysql_sync_source_dump_path }}" dest: "{{ _ce_deploy_build_tmp_dir }}/{{ database.target.database }}.sql.bz2" flat: true delegate_to: "{{ database.source.host }}" - name: Copy dump file to destination. - copy: + ansible.builtin.copy: src: "{{ _ce_deploy_build_tmp_dir }}/{{ database.target.database }}.sql.bz2" dest: "{{ mysql_sync_target_dump_path }}" - name: Drop target database. - shell: "mysql --defaults-extra-file={{ database.target.credentials_file }} -e 'drop database if exists {{ mysql_sync_target_database }};'" + ansible.builtin.command: + cmd: "mysql --defaults-extra-file={{ database.target.credentials_file }} -e 'drop database if exists {{ mysql_sync_target_database }};'" - name: Recreate target database. - shell: "mysql --defaults-extra-file={{ database.target.credentials_file }} -e 'create database {{ mysql_sync_target_database }};'" + ansible.builtin.command: + cmd: "mysql --defaults-extra-file={{ database.target.credentials_file }} -e 'create database {{ mysql_sync_target_database }};'" - name: Repopulate database from dump. - shell: "bzcat {{ mysql_sync_target_dump_path }} | mysql --defaults-extra-file={{ database.target.credentials_file }} {{ mysql_sync_target_database }}" + ansible.builtin.shell: "bzcat {{ mysql_sync_target_dump_path }} | mysql --defaults-extra-file={{ database.target.credentials_file }} {{ mysql_sync_target_database }}" - name: Remove tmp dump file. - file: + ansible.builtin.file: path: "{{ mysql_sync_target_dump_path }}" state: absent diff --git a/roles/sync/database_sync/tasks/main.yml b/roles/sync/database_sync/tasks/main.yml index a3992186..650a9e0a 100644 --- a/roles/sync/database_sync/tasks/main.yml +++ b/roles/sync/database_sync/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Sync databases. - include_role: + ansible.builtin.include_role: name: "sync/database_sync/database_sync-{{ engine }}" with_items: "{{ database_sync.engines }}" loop_control: diff --git a/roles/sync/drupal_sync_tasks/cache_clear/cache_clear-drupal8/tasks/main.yml b/roles/sync/drupal_sync_tasks/cache_clear/cache_clear-drupal8/tasks/main.yml index 96c721ee..431366cf 100644 --- a/roles/sync/drupal_sync_tasks/cache_clear/cache_clear-drupal8/tasks/main.yml +++ b/roles/sync/drupal_sync_tasks/cache_clear/cache_clear-drupal8/tasks/main.yml @@ -1,4 +1,13 @@ --- +# Drupal 8 ships drush with the website code so we need the previous build in the path. +- name: Stash the drush_bin variable. + ansible.builtin.set_fact: + _drush_bin_deploy: "{{ drush_bin }}" + +- name: Update location of drush for the sync cache clear command. + ansible.builtin.set_fact: + drush_bin: "{{ live_symlink_dest }}/vendor/bin/drush" + - name: Clear Drupal cache. ansible.builtin.command: cmd: "{{ drush_bin }} -l {{ site.folder }} -y cr" @@ -9,3 +18,7 @@ loop_control: loop_var: site run_once: true + +- name: Restore the drush_bin variable. + ansible.builtin.set_fact: + drush_bin: "{{ _drush_bin_deploy }}" diff --git a/roles/sync/drupal_sync_tasks/database_apply/database_apply-drupal7/tasks/main.yml b/roles/sync/drupal_sync_tasks/database_apply/database_apply-drupal7/tasks/main.yml index f520514e..ea4c083b 100644 --- a/roles/sync/drupal_sync_tasks/database_apply/database_apply-drupal7/tasks/main.yml +++ b/roles/sync/drupal_sync_tasks/database_apply/database_apply-drupal7/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Apply Drupal database updates. - ansible.builtin.shell: + ansible.builtin.command: cmd: "{{ drush_bin }} -l {{ site.folder }} -y updb" chdir: "{{ live_symlink_dest }}/{{ webroot }}/sites/{{ site.folder }}" with_items: "{{ drupal.sites }}" diff --git a/roles/sync/drupal_sync_tasks/database_apply/database_apply-drupal8/tasks/main.yml b/roles/sync/drupal_sync_tasks/database_apply/database_apply-drupal8/tasks/main.yml index e050af3f..c62c9915 100644 --- a/roles/sync/drupal_sync_tasks/database_apply/database_apply-drupal8/tasks/main.yml +++ b/roles/sync/drupal_sync_tasks/database_apply/database_apply-drupal8/tasks/main.yml @@ -1,4 +1,13 @@ --- +# Drupal 8 ships drush with the website code so we need the previous build in the path. +- name: Stash the drush_bin variable. + ansible.builtin.set_fact: + _drush_bin_deploy: "{{ drush_bin }}" + +- name: Update location of drush for the sync cache clear command. + ansible.builtin.set_fact: + drush_bin: "{{ live_symlink_dest }}/vendor/bin/drush" + - name: Apply Drupal database updates. ansible.builtin.command: cmd: "{{ drush_bin }} -l {{ site.folder }} -y updb" @@ -26,3 +35,7 @@ - name: Clear the cache. ansible.builtin.include_role: name: "sync/drupal_sync_tasks/cache_clear/cache_clear-{{ project_type }}" + +- name: Restore the drush_bin variable. + ansible.builtin.set_fact: + drush_bin: "{{ _drush_bin_deploy }}" diff --git a/roles/sync/files_sync/tasks/main.yml b/roles/sync/files_sync/tasks/main.yml index 47c3667a..3107eb24 100644 --- a/roles/sync/files_sync/tasks/main.yml +++ b/roles/sync/files_sync/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Sync files. - include_tasks: "sync.yml" + ansible.builtin.include_tasks: "sync.yml" with_items: "{{ files_sync.directories }}" loop_control: loop_var: files