hotfix: use auto python interpreter for package tasks, virtualenv for all other tasks

2025-12-17 02:13:06 -06:00 · 2020-11-03 11:51:52 +11:00
parent 73bd0f407a
commit 229bbf01f6
13 changed files with 51 additions and 34 deletions
--- a/2
+++ b/2
@@ -7,7 +7,7 @@ name = "pypi"
 ansible = "==2.8.5"
 boto3 = "==1.9.242"
 botocore = "==1.12.242"
-lxml = "*"
+lxml = "==4.6.1"

 [dev-packages]
 docker = "==4.1.0"
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
    "_meta": {
        "hash": {
-            "sha256": "ea0ba698805dad68df872c1cf713c57cbcc4a6e37c4c0efc5bb8f3302e153f00"
+            "sha256": "358192d71e2d81a31da6216f1b90640dc26b8414bb7ca61d6f13036531764cef"
        },
        "pipfile-spec": 6,
        "requires": {
@@ -135,42 +135,43 @@
        },
        "lxml": {
            "hashes": [
-                "sha256:0e89f5d422988c65e6936e4ec0fe54d6f73f3128c80eb7ecc3b87f595523607b",
-                "sha256:189ad47203e846a7a4951c17694d845b6ade7917c47c64b29b86526eefc3adf5",
-                "sha256:1d87936cb5801c557f3e981c9c193861264c01209cb3ad0964a16310ca1b3301",
-                "sha256:211b3bcf5da70c2d4b84d09232534ad1d78320762e2c59dedc73bf01cb1fc45b",
-                "sha256:2358809cc64394617f2719147a58ae26dac9e21bae772b45cfb80baa26bfca5d",
-                "sha256:23c83112b4dada0b75789d73f949dbb4e8f29a0a3511647024a398ebd023347b",
-                "sha256:24e811118aab6abe3ce23ff0d7d38932329c513f9cef849d3ee88b0f848f2aa9",
-                "sha256:2d5896ddf5389560257bbe89317ca7bcb4e54a02b53a3e572e1ce4226512b51b",
                "sha256:2d6571c48328be4304aee031d2d5046cbc8aed5740c654575613c5a4f5a11311",
-                "sha256:2e311a10f3e85250910a615fe194839a04a0f6bc4e8e5bb5cac221344e3a7891",
-                "sha256:302160eb6e9764168e01d8c9ec6becddeb87776e81d3fcb0d97954dd51d48e0a",
-                "sha256:3a7a380bfecc551cfd67d6e8ad9faa91289173bdf12e9cfafbd2bdec0d7b1ec1",
-                "sha256:3d9b2b72eb0dbbdb0e276403873ecfae870599c83ba22cadff2db58541e72856",
-                "sha256:475325e037fdf068e0c2140b818518cf6bc4aa72435c407a798b2db9f8e90810",
-                "sha256:4b7572145054330c8e324a72d808c8c8fbe12be33368db28c39a255ad5f7fb51",
-                "sha256:4fff34721b628cce9eb4538cf9a73d02e0f3da4f35a515773cce6f5fe413b360",
-                "sha256:56eff8c6fb7bc4bcca395fdff494c52712b7a57486e4fbde34c31bb9da4c6cc4",
                "sha256:573b2f5496c7e9f4985de70b9bbb4719ffd293d5565513e04ac20e42e6e5583f",
-                "sha256:7ecaef52fd9b9535ae5f01a1dd2651f6608e4ec9dc136fc4dfe7ebe3c3ddb230",
-                "sha256:803a80d72d1f693aa448566be46ffd70882d1ad8fc689a2e22afe63035eb998a",
-                "sha256:8862d1c2c020cb7a03b421a9a7b4fe046a208db30994fc8ff68c627a7915987f",
-                "sha256:9b06690224258db5cd39a84e993882a6874676f5de582da57f3df3a82ead9174",
-                "sha256:a71400b90b3599eb7bf241f947932e18a066907bf84617d80817998cee81e4bf",
-                "sha256:bb252f802f91f59767dcc559744e91efa9df532240a502befd874b54571417bd",
-                "sha256:be1ebf9cc25ab5399501c9046a7dcdaa9e911802ed0e12b7d620cd4bbf0518b3",
-                "sha256:be7c65e34d1b50ab7093b90427cbc488260e4b3a38ef2435d65b62e9fa3d798a",
-                "sha256:c0dac835c1a22621ffa5e5f999d57359c790c52bbd1c687fe514ae6924f65ef5",
-                "sha256:c152b2e93b639d1f36ec5a8ca24cde4a8eefb2b6b83668fcd8e83a67badcb367",
-                "sha256:d182eada8ea0de61a45a526aa0ae4bcd222f9673424e65315c35820291ff299c",
-                "sha256:d18331ea905a41ae71596502bd4c9a2998902328bbabd29e3d0f5f8569fabad1",
                "sha256:d20d32cbb31d731def4b1502294ca2ee99f9249b63bc80e03e67e8f8e126dea8",
-                "sha256:d4ad7fd3269281cb471ad6c7bafca372e69789540d16e3755dd717e9e5c9d82f",
-                "sha256:d6f8c23f65a4bfe4300b85f1f40f6c32569822d08901db3b6454ab785d9117cc",
-                "sha256:d84d741c6e35c9f3e7406cb7c4c2e08474c2a6441d59322a00dcae65aac6315d",
                "sha256:e65c221b2115a91035b55a593b6eb94aa1206fa3ab374f47c6dc10d364583ff9",
-                "sha256:f98b6f256be6cec8dd308a8563976ddaff0bdc18b730720f6f4bee927ffe926f"
+                "sha256:be1ebf9cc25ab5399501c9046a7dcdaa9e911802ed0e12b7d620cd4bbf0518b3",
+                "sha256:189ad47203e846a7a4951c17694d845b6ade7917c47c64b29b86526eefc3adf5",
+                "sha256:2e311a10f3e85250910a615fe194839a04a0f6bc4e8e5bb5cac221344e3a7891",
+                "sha256:a71400b90b3599eb7bf241f947932e18a066907bf84617d80817998cee81e4bf",
+                "sha256:d4ad7fd3269281cb471ad6c7bafca372e69789540d16e3755dd717e9e5c9d82f",
+                "sha256:302160eb6e9764168e01d8c9ec6becddeb87776e81d3fcb0d97954dd51d48e0a",
+                "sha256:9b06690224258db5cd39a84e993882a6874676f5de582da57f3df3a82ead9174",
+                "sha256:d84d741c6e35c9f3e7406cb7c4c2e08474c2a6441d59322a00dcae65aac6315d",
+                "sha256:24e811118aab6abe3ce23ff0d7d38932329c513f9cef849d3ee88b0f848f2aa9",
+                "sha256:bb252f802f91f59767dcc559744e91efa9df532240a502befd874b54571417bd",
+                "sha256:be7c65e34d1b50ab7093b90427cbc488260e4b3a38ef2435d65b62e9fa3d798a",
+                "sha256:d6f8c23f65a4bfe4300b85f1f40f6c32569822d08901db3b6454ab785d9117cc",
+                "sha256:c0dac835c1a22621ffa5e5f999d57359c790c52bbd1c687fe514ae6924f65ef5",
+                "sha256:23c83112b4dada0b75789d73f949dbb4e8f29a0a3511647024a398ebd023347b",
+                "sha256:4b7572145054330c8e324a72d808c8c8fbe12be33368db28c39a255ad5f7fb51",
+                "sha256:8862d1c2c020cb7a03b421a9a7b4fe046a208db30994fc8ff68c627a7915987f",
+                "sha256:211b3bcf5da70c2d4b84d09232534ad1d78320762e2c59dedc73bf01cb1fc45b",
+                "sha256:0e89f5d422988c65e6936e4ec0fe54d6f73f3128c80eb7ecc3b87f595523607b",
+                "sha256:2358809cc64394617f2719147a58ae26dac9e21bae772b45cfb80baa26bfca5d",
+                "sha256:d18331ea905a41ae71596502bd4c9a2998902328bbabd29e3d0f5f8569fabad1",
+                "sha256:7ecaef52fd9b9535ae5f01a1dd2651f6608e4ec9dc136fc4dfe7ebe3c3ddb230",
+                "sha256:2d5896ddf5389560257bbe89317ca7bcb4e54a02b53a3e572e1ce4226512b51b",
+                "sha256:3a7a380bfecc551cfd67d6e8ad9faa91289173bdf12e9cfafbd2bdec0d7b1ec1",
+                "sha256:c152b2e93b639d1f36ec5a8ca24cde4a8eefb2b6b83668fcd8e83a67badcb367",
+                "sha256:3d9b2b72eb0dbbdb0e276403873ecfae870599c83ba22cadff2db58541e72856",
+                "sha256:1d87936cb5801c557f3e981c9c193861264c01209cb3ad0964a16310ca1b3301",
+                "sha256:4fff34721b628cce9eb4538cf9a73d02e0f3da4f35a515773cce6f5fe413b360",
+                "sha256:475325e037fdf068e0c2140b818518cf6bc4aa72435c407a798b2db9f8e90810",
+                "sha256:d182eada8ea0de61a45a526aa0ae4bcd222f9673424e65315c35820291ff299c",
+                "sha256:803a80d72d1f693aa448566be46ffd70882d1ad8fc689a2e22afe63035eb998a",
+                "sha256:098fb713b31050463751dcc694878e1d39f316b86366fb9fe3fbbe5396ac9fab",
+                "sha256:f98b6f256be6cec8dd308a8563976ddaff0bdc18b730720f6f4bee927ffe926f",
+                "sha256:56eff8c6fb7bc4bcca395fdff494c52712b7a57486e4fbde34c31bb9da4c6cc4"
            ],
            "index": "pypi",
            "version": "==4.6.1"
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,3 +1,4 @@
 [defaults]
 retry_files_enabled = False
 callback_whitelist = profile_tasks
+ansible_python_interpreter="/usr/bin/env python3"
--- a/roles/aws_common/tasks/amazon.yml
+++ b/roles/aws_common/tasks/amazon.yml
@@ -8,6 +8,7 @@
      - awscli
      - git
      - ec2-utils
+  ansible_python_interpreter: auto

 - name: Install CloudWatch Agent
  yum:
@@ -16,3 +17,4 @@
  when: atl_aws_enable_cloudwatch is defined and atl_aws_enable_cloudwatch
  notify:
    - Enable CloudWatch Agent
+  ansible_python_interpreter: auto
--- a/roles/confluence_config/tasks/amazon_fonts.yml
+++ b/roles/confluence_config/tasks/amazon_fonts.yml
@@ -4,6 +4,7 @@
  yum:
    name:
      - "google-noto-*"
+  ansible_python_interpreter: auto

 - name: Link the language fonts into the JDK
  # Not idiomatic, but cleaner than messing with nested lookups...
--- a/roles/create_backups/tasks/amazon.yml
+++ b/roles/create_backups/tasks/amazon.yml
@@ -8,10 +8,12 @@
    description: Atlassian Slingshot
    baseurl: "{{ atl_slingshot_yum_repo_url }}"
    gpgcheck: no
+  ansible_python_interpreter: auto

 - name: Install atlassian-slingshot
  yum:
    name: atlassian-slingshot
+  ansible_python_interpreter: auto

 - name: Enable Postgresql from 'extras'
  command: amazon-linux-extras install -y "postgresql{{ atl_amazon_extras_postgresql_version }}"
--- a/roles/diy_backup/molecule/default/playbook.yml
+++ b/roles/diy_backup/molecule/default/playbook.yml
@@ -27,6 +27,7 @@
    - name: Install git
      package:
        name: git
+      ansible_python_interpreter: auto

  roles:
    - role: diy_backup
--- a/roles/linux_common/tasks/amazon.yml
+++ b/roles/linux_common/tasks/amazon.yml
@@ -7,3 +7,4 @@
      - libxml2
      - git-{{ git_version }}
      - dejavu-sans-fonts
+  ansible_python_interpreter: auto
--- a/roles/linux_common/tasks/main.yml
+++ b/roles/linux_common/tasks/main.yml
@@ -14,6 +14,7 @@
      - unzip
      - fontconfig
      - python-psycopg2
+  ansible_python_interpreter: auto

 - name: Create product group
  group:
--- a/roles/nfs_server/tasks/amazon.yml
+++ b/roles/nfs_server/tasks/amazon.yml
@@ -4,3 +4,4 @@
  yum:
    name:
      - nfs-utils
+  ansible_python_interpreter: auto
--- a/roles/product_common/tasks/amazon.yml
+++ b/roles/product_common/tasks/amazon.yml
@@ -12,11 +12,13 @@
        gpgkey: https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public
        gpgcheck: yes
        state: present
+      ansible_python_interpreter: auto

    - name: Install AdoptOpenJDK
      yum:
        name: "adoptopenjdk-{{ java_major_version }}-hotspot"
        state: present
+      ansible_python_interpreter: auto

    - name: Ensure common JDK symlink exists
      alternatives:
@@ -33,3 +35,4 @@
  yum:
    name:
      - dejavu-fonts-common  # Required by the installer
+  ansible_python_interpreter: auto
--- a/roles/restore_backups/molecule/restore_conf_server/playbook.yml
+++ b/roles/restore_backups/molecule/restore_conf_server/playbook.yml
@@ -28,6 +28,7 @@
        name:
          - tar
          - shadow-utils
+      ansible_python_interpreter: auto

    - name: "{{ test_pre_step_prefix }} Create application group"
      group:
--- a/roles/restore_backups/molecule/restore_jira_clustered/playbook.yml
+++ b/roles/restore_backups/molecule/restore_jira_clustered/playbook.yml
@@ -25,11 +25,13 @@
      package:
        state: present
        name: tar
+      ansible_python_interpreter: auto

    - name: "{{ test_pre_step_prefix }} Install useradd and groupadd binaries"
      package:
        state: present
        name: shadow-utils
+      ansible_python_interpreter: auto

    - name: "{{ test_pre_step_prefix }} Create application group"
      group: