ITPLT-3650 compatibility updates for ansible-core 2.16 and other dependencies

2025-12-13 00:13:09 -06:00 · 2024-04-26 13:07:57 -05:00
parent cff27677c6
commit ecb262a15f
44 changed files with 43 additions and 45 deletions
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,4 +1,4 @@
 [defaults]
 retry_files_enabled = False
 callbacks_enabled = profile_tasks
-collections_paths = ./
+collections_path = ./
--- a/roles/aws_common/handlers/main.yml
+++ b/roles/aws_common/handlers/main.yml
@@ -1,14 +1,14 @@
 ---

 - name: Enable CloudWatch Agent
-  ansible.builtin.systemd:
+  ansible.builtin.systemd_service:
    name: "amazon-cloudwatch-agent.service"
    daemon_reload: true
    enabled: true
  when: atl_aws_agent_restart | bool

 - name: Restart CloudWatch Agent
-  ansible.builtin.systemd:
+  ansible.builtin.systemd_service:
    name: "amazon-cloudwatch-agent.service"
    enabled: true
    state: restarted
--- a/roles/aws_common/molecule/cw-disabled/molecule.yml
+++ b/roles/aws_common/molecule/cw-disabled/molecule.yml
@@ -15,7 +15,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  inventory:
    links:
      group_vars: ../../../../group_vars/
--- a/roles/aws_common/molecule/default/molecule.yml
+++ b/roles/aws_common/molecule/default/molecule.yml
@@ -15,7 +15,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  inventory:
    links:
      group_vars: ../../../../group_vars/
--- a/roles/aws_common/molecule/logs-disabled/molecule.yml
+++ b/roles/aws_common/molecule/logs-disabled/molecule.yml
@@ -15,7 +15,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  inventory:
    links:
      group_vars: ../../../../group_vars/
--- a/roles/bitbucket_config/molecule/default/molecule.yml
+++ b/roles/bitbucket_config/molecule/default/molecule.yml
@@ -23,7 +23,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/bitbucket_config/molecule/iam_elasticsearch/molecule.yml
+++ b/roles/bitbucket_config/molecule/iam_elasticsearch/molecule.yml
@@ -23,7 +23,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/confluence_config/molecule/aurora/molecule.yml
+++ b/roles/confluence_config/molecule/aurora/molecule.yml
@@ -17,7 +17,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/confluence_config/molecule/default/molecule.yml
+++ b/roles/confluence_config/molecule/default/molecule.yml
@@ -17,7 +17,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/confluence_config/molecule/password_char_escaping/molecule.yml
+++ b/roles/confluence_config/molecule/password_char_escaping/molecule.yml
@@ -18,7 +18,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/confluence_config/molecule/system_jdk/molecule.yml
+++ b/roles/confluence_config/molecule/system_jdk/molecule.yml
@@ -17,7 +17,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/confluence_config/tasks/amazon-2023_fonts.yml
+++ b/roles/confluence_config/tasks/amazon-2023_fonts.yml
@@ -10,6 +10,5 @@
  ansible.builtin.shell:
    cmd: "ln -sf /usr/share/fonts/google-noto*/* {{ item }}/"
    creates: "{{ item }}/NotoSansJavanese-Regular.ttf"
-    warn: false
  with_items: "{{ atl_fonts_fallback_dirs }}"
  changed_when: false  # For Molecule idempotence check
--- a/roles/confluence_config/tasks/ubuntu_fonts.yml
+++ b/roles/confluence_config/tasks/ubuntu_fonts.yml
@@ -10,6 +10,5 @@
  ansible.builtin.shell:
    cmd: "ln -sf /usr/share/fonts/truetype/noto/* {{ item }}/"
    creates: "{{ item }}/NotoSansJavanese-Regular.ttf"
-    warn: false
  with_items: "{{ atl_fonts_fallback_dirs }}"
  changed_when: false  # For Molecule idempotence check
--- a/roles/diy_backup/molecule/default/molecule.yml
+++ b/roles/diy_backup/molecule/default/molecule.yml
@@ -23,7 +23,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/jira_config/molecule/aurora/molecule.yml
+++ b/roles/jira_config/molecule/aurora/molecule.yml
@@ -23,7 +23,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/jira_config/molecule/default/molecule.yml
+++ b/roles/jira_config/molecule/default/molecule.yml
@@ -23,7 +23,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/jira_config/molecule/jira_config_props/molecule.yml
+++ b/roles/jira_config/molecule/jira_config_props/molecule.yml
@@ -23,7 +23,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/jira_config/molecule/password_char_escaping/molecule.yml
+++ b/roles/jira_config/molecule/password_char_escaping/molecule.yml
@@ -23,7 +23,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/linux_common/molecule/default/molecule.yml
+++ b/roles/linux_common/molecule/default/molecule.yml
@@ -17,7 +17,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  inventory:
    links:
      group_vars: ../../../../group_vars/
--- a/roles/linux_common/tasks/main.yml
+++ b/roles/linux_common/tasks/main.yml
@@ -41,7 +41,7 @@
  register: systemd_config_changed

 - name: Force systemd to reload daemon configuration
-  ansible.builtin.systemd:
+  ansible.builtin.systemd_service:
    daemon_reload: yes
  when:
    - systemd_config_changed is defined
--- a/roles/nfs_server/tasks/amazon-2023.yml
+++ b/roles/nfs_server/tasks/amazon-2023.yml
@@ -14,5 +14,5 @@
    state: link

 - name: Reload systemd services
-  ansible.builtin.systemd:
+  ansible.builtin.systemd_service:
    daemon_reload: yes
--- a/roles/product_common/molecule/default/molecule.yml
+++ b/roles/product_common/molecule/default/molecule.yml
@@ -11,6 +11,6 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
 verifier:
  name: testinfra
--- a/roles/product_common/molecule/system_jdk/molecule.yml
+++ b/roles/product_common/molecule/system_jdk/molecule.yml
@@ -11,6 +11,6 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
 verifier:
  name: testinfra
--- a/roles/product_install/molecule/bitbucket_latest/molecule.yml
+++ b/roles/product_install/molecule/bitbucket_latest/molecule.yml
@@ -17,7 +17,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/confluence_latest/molecule.yml
+++ b/roles/product_install/molecule/confluence_latest/molecule.yml
@@ -17,7 +17,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/confluence_version_with_uppercase/molecule.yml
+++ b/roles/product_install/molecule/confluence_version_with_uppercase/molecule.yml
@@ -17,7 +17,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/crowd_latest/molecule.yml
+++ b/roles/product_install/molecule/crowd_latest/molecule.yml
@@ -17,7 +17,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/default/molecule.yml
+++ b/roles/product_install/molecule/default/molecule.yml
@@ -17,7 +17,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/jira_all/molecule.yml
+++ b/roles/product_install/molecule/jira_all/molecule.yml
@@ -17,7 +17,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/jira_cached_with_downgrade/molecule.yml
+++ b/roles/product_install/molecule/jira_cached_with_downgrade/molecule.yml
@@ -17,7 +17,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    vvv: true
    skip-tags: runtime_pkg
--- a/roles/product_install/molecule/jira_cached_with_upgrade/molecule.yml
+++ b/roles/product_install/molecule/jira_cached_with_upgrade/molecule.yml
@@ -17,7 +17,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    vvv: true
    skip-tags: runtime_pkg
--- a/roles/product_install/molecule/jira_software_latest/molecule.yml
+++ b/roles/product_install/molecule/jira_software_latest/molecule.yml
@@ -17,7 +17,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/jira_tarball/molecule.yml
+++ b/roles/product_install/molecule/jira_tarball/molecule.yml
@@ -17,7 +17,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/jira_tarball_download_url/molecule.yml
+++ b/roles/product_install/molecule/jira_tarball_download_url/molecule.yml
@@ -17,7 +17,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/jira_version_from_file/molecule.yml
+++ b/roles/product_install/molecule/jira_version_from_file/molecule.yml
@@ -17,7 +17,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/jira_version_latest/molecule.yml
+++ b/roles/product_install/molecule/jira_version_latest/molecule.yml
@@ -17,7 +17,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/jira_version_override/molecule.yml
+++ b/roles/product_install/molecule/jira_version_override/molecule.yml
@@ -17,7 +17,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/servicedesk3/molecule.yml
+++ b/roles/product_install/molecule/servicedesk3/molecule.yml
@@ -17,7 +17,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    vv: true
    skip-tags: runtime_pkg
--- a/roles/product_install/molecule/servicedesk4/molecule.yml
+++ b/roles/product_install/molecule/servicedesk4/molecule.yml
@@ -17,7 +17,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    vv: true
    skip-tags: runtime_pkg
--- a/roles/product_install/molecule/servicedesk_latest/molecule.yml
+++ b/roles/product_install/molecule/servicedesk_latest/molecule.yml
@@ -17,7 +17,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    vv: true
    skip-tags: runtime_pkg
--- a/roles/product_startup/molecule/bitbucket/molecule.yml
+++ b/roles/product_startup/molecule/bitbucket/molecule.yml
@@ -23,7 +23,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_startup/molecule/default/molecule.yml
+++ b/roles/product_startup/molecule/default/molecule.yml
@@ -23,7 +23,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_startup/molecule/startup_restart_false/molecule.yml
+++ b/roles/product_startup/molecule/startup_restart_false/molecule.yml
@@ -23,7 +23,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
    ATL_STARTUP_RESTART: "false"
  options:
    skip-tags: runtime_pkg
--- a/roles/product_startup/molecule/synchrony/molecule.yml
+++ b/roles/product_startup/molecule/synchrony/molecule.yml
@@ -23,7 +23,7 @@ platforms:
 provisioner:
  name: ansible
  env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
  options:
    skip-tags: runtime_pkg
  inventory: