From e75d5d4fba3b4f34c6e6c6702d95b937f2c706ed 2020-05-08 00:25:35 From: Branko Majic Date: 2020-05-08 00:25:35 Subject: [PATCH] MAR-149: Switch Molecule to using Python 3 interpreter in all tests on remote machines. --- diff --git a/roles/backup/molecule/default/molecule.yml b/roles/backup/molecule/default/molecule.yml index 68713cc78beaeb94d8d7d552acd748715c422b17..4cc9e62967ccec0aacb4dca5bc5074c473406319 100644 --- a/roles/backup/molecule/default/molecule.yml +++ b/roles/backup/molecule/default/molecule.yml @@ -33,6 +33,7 @@ provisioner: config_options: defaults: force_valid_group_names: "ignore" + interpreter_python: "/usr/bin/python3" ssh_connection: pipelining: "True" lint: diff --git a/roles/backup/molecule/default/prepare.yml b/roles/backup/molecule/default/prepare.yml index ecfa6db10c57f61e118e827fb3a95abf2159de8c..fddd69fd2ab07db6f95b7553fa4c7a0431ebd22c 100644 --- a/roles/backup/molecule/default/prepare.yml +++ b/roles/backup/molecule/default/prepare.yml @@ -5,7 +5,7 @@ gather_facts: false tasks: - name: Install python for Ansible - raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal) + raw: test -e /usr/bin/python3 || (apt -y update && apt install -y python3-minimal) become: true changed_when: false diff --git a/roles/backup_client/molecule/default/molecule.yml b/roles/backup_client/molecule/default/molecule.yml index 8a2fbc34ba3f8c7963b662dd5f859ce5de90eb72..a97db4ee451de6de328a3d6c5a66e62fb73e0b4f 100644 --- a/roles/backup_client/molecule/default/molecule.yml +++ b/roles/backup_client/molecule/default/molecule.yml @@ -56,6 +56,7 @@ provisioner: config_options: defaults: force_valid_group_names: "ignore" + interpreter_python: "/usr/bin/python3" ssh_connection: pipelining: "True" lint: diff --git a/roles/backup_client/molecule/default/prepare.yml b/roles/backup_client/molecule/default/prepare.yml index c53ff691d83a2af3bac074595c080c1691bc824d..9f193697c592708bf2ef7df3192e662c84d14a6e 100644 --- a/roles/backup_client/molecule/default/prepare.yml +++ b/roles/backup_client/molecule/default/prepare.yml @@ -5,7 +5,7 @@ gather_facts: false tasks: - name: Install python for Ansible - raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal) + raw: test -e /usr/bin/python3 || (apt -y update && apt install -y python3-minimal) become: true changed_when: false diff --git a/roles/backup_server/molecule/default/molecule.yml b/roles/backup_server/molecule/default/molecule.yml index 47756c86e4c0a74f5aa1527919cf8aacc882e3e5..490c539459b19056550e752a6f3540d4a6a1e5d3 100644 --- a/roles/backup_server/molecule/default/molecule.yml +++ b/roles/backup_server/molecule/default/molecule.yml @@ -43,6 +43,7 @@ provisioner: config_options: defaults: force_valid_group_names: "ignore" + interpreter_python: "/usr/bin/python3" ssh_connection: pipelining: "True" lint: diff --git a/roles/backup_server/molecule/default/prepare.yml b/roles/backup_server/molecule/default/prepare.yml index 8eff2759cea6e7feacbd9d3ae4de9ba6918567a7..85d51d2ea5b4f1aac00053e50d0a4a2dfb2bfb8b 100644 --- a/roles/backup_server/molecule/default/prepare.yml +++ b/roles/backup_server/molecule/default/prepare.yml @@ -22,7 +22,7 @@ tasks: - name: Install python for Ansible - raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal) + raw: test -e /usr/bin/python3 || (apt -y update && apt install -y python3-minimal) become: true changed_when: false diff --git a/roles/bootstrap/molecule/default/molecule.yml b/roles/bootstrap/molecule/default/molecule.yml index 68713cc78beaeb94d8d7d552acd748715c422b17..4cc9e62967ccec0aacb4dca5bc5074c473406319 100644 --- a/roles/bootstrap/molecule/default/molecule.yml +++ b/roles/bootstrap/molecule/default/molecule.yml @@ -33,6 +33,7 @@ provisioner: config_options: defaults: force_valid_group_names: "ignore" + interpreter_python: "/usr/bin/python3" ssh_connection: pipelining: "True" lint: diff --git a/roles/bootstrap/molecule/default/prepare.yml b/roles/bootstrap/molecule/default/prepare.yml index 158b8ffaedaabd5c0ad543860b1914ba2c24a683..f03d4f5d4175634a32df11c26577179983e34278 100644 --- a/roles/bootstrap/molecule/default/prepare.yml +++ b/roles/bootstrap/molecule/default/prepare.yml @@ -5,7 +5,7 @@ gather_facts: false tasks: - name: Install python for Ansible - raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal) + raw: test -e /usr/bin/python3 || (apt -y update && apt install -y python3-minimal) become: true changed_when: false diff --git a/roles/common/molecule/default/molecule.yml b/roles/common/molecule/default/molecule.yml index 7d05105c236af91314c6e7d383aefe71e656d9ba..e8157ed81e30c61b4ebfe54b3f062f8786d40431 100644 --- a/roles/common/molecule/default/molecule.yml +++ b/roles/common/molecule/default/molecule.yml @@ -52,6 +52,7 @@ provisioner: config_options: defaults: force_valid_group_names: "ignore" + interpreter_python: "/usr/bin/python3" ssh_connection: pipelining: "True" lint: diff --git a/roles/common/molecule/default/prepare.yml b/roles/common/molecule/default/prepare.yml index 1a0942c04ab0c820a564a05fb8f3a8489b2a6aea..939d81f1082f9aca527cdb9459530d0b734b35af 100644 --- a/roles/common/molecule/default/prepare.yml +++ b/roles/common/molecule/default/prepare.yml @@ -6,7 +6,7 @@ tasks: - name: Install python for Ansible - raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal) + raw: test -e /usr/bin/python3 || (apt -y update && apt install -y python3-minimal) become: true changed_when: false diff --git a/roles/database/molecule/default/molecule.yml b/roles/database/molecule/default/molecule.yml index a91a59f9e85a6a754d7d49f184909dc83b89080a..a6e0f9bfafa00aa778df2e3d60e420d46c8a44fb 100644 --- a/roles/database/molecule/default/molecule.yml +++ b/roles/database/molecule/default/molecule.yml @@ -35,6 +35,7 @@ provisioner: config_options: defaults: force_valid_group_names: "ignore" + interpreter_python: "/usr/bin/python3" ssh_connection: pipelining: "True" lint: diff --git a/roles/database/molecule/default/prepare.yml b/roles/database/molecule/default/prepare.yml index 55f8d9f94a6942db2f8bb2587db498d8fd20c6e7..97d285fa07e9ac41d87eafcddbc9a37206ffcf59 100644 --- a/roles/database/molecule/default/prepare.yml +++ b/roles/database/molecule/default/prepare.yml @@ -5,7 +5,7 @@ gather_facts: false tasks: - name: Install python for Ansible - raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal) + raw: test -e /usr/bin/python3 || (apt -y update && apt install -y python3-minimal) become: true changed_when: false diff --git a/roles/database_server/molecule/default/molecule.yml b/roles/database_server/molecule/default/molecule.yml index 761eaa987c93a9f0842141b78771a3c932582080..1b85feb798d0e2405fe18725b7c7856ed9e5d7b6 100644 --- a/roles/database_server/molecule/default/molecule.yml +++ b/roles/database_server/molecule/default/molecule.yml @@ -26,6 +26,7 @@ provisioner: config_options: defaults: force_valid_group_names: "ignore" + interpreter_python: "/usr/bin/python3" ssh_connection: pipelining: "True" lint: diff --git a/roles/database_server/molecule/default/prepare.yml b/roles/database_server/molecule/default/prepare.yml index ecfa6db10c57f61e118e827fb3a95abf2159de8c..fddd69fd2ab07db6f95b7553fa4c7a0431ebd22c 100644 --- a/roles/database_server/molecule/default/prepare.yml +++ b/roles/database_server/molecule/default/prepare.yml @@ -5,7 +5,7 @@ gather_facts: false tasks: - name: Install python for Ansible - raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal) + raw: test -e /usr/bin/python3 || (apt -y update && apt install -y python3-minimal) become: true changed_when: false diff --git a/roles/ldap_client/molecule/default/molecule.yml b/roles/ldap_client/molecule/default/molecule.yml index 68713cc78beaeb94d8d7d552acd748715c422b17..4cc9e62967ccec0aacb4dca5bc5074c473406319 100644 --- a/roles/ldap_client/molecule/default/molecule.yml +++ b/roles/ldap_client/molecule/default/molecule.yml @@ -33,6 +33,7 @@ provisioner: config_options: defaults: force_valid_group_names: "ignore" + interpreter_python: "/usr/bin/python3" ssh_connection: pipelining: "True" lint: diff --git a/roles/ldap_client/molecule/default/prepare.yml b/roles/ldap_client/molecule/default/prepare.yml index ecfa6db10c57f61e118e827fb3a95abf2159de8c..fddd69fd2ab07db6f95b7553fa4c7a0431ebd22c 100644 --- a/roles/ldap_client/molecule/default/prepare.yml +++ b/roles/ldap_client/molecule/default/prepare.yml @@ -5,7 +5,7 @@ gather_facts: false tasks: - name: Install python for Ansible - raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal) + raw: test -e /usr/bin/python3 || (apt -y update && apt install -y python3-minimal) become: true changed_when: false diff --git a/roles/ldap_server/molecule/default/molecule.yml b/roles/ldap_server/molecule/default/molecule.yml index a9ff3ebffc0f6b9f0d94369668c4921ca77949e5..c1448a89cd240337ad9fc7a8719588726c500662 100644 --- a/roles/ldap_server/molecule/default/molecule.yml +++ b/roles/ldap_server/molecule/default/molecule.yml @@ -54,6 +54,7 @@ provisioner: config_options: defaults: force_valid_group_names: "ignore" + interpreter_python: "/usr/bin/python3" ssh_connection: pipelining: "True" lint: diff --git a/roles/ldap_server/molecule/default/prepare.yml b/roles/ldap_server/molecule/default/prepare.yml index 061d2cb12cdcc9dca9474f50e000338110f994ee..31dd4226c6bb26af610a4e3025cd00bc2b988e45 100644 --- a/roles/ldap_server/molecule/default/prepare.yml +++ b/roles/ldap_server/molecule/default/prepare.yml @@ -5,7 +5,7 @@ gather_facts: false tasks: - name: Install python for Ansible - raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal) + raw: test -e /usr/bin/python3 || (apt -y update && apt install -y python3-minimal) become: true changed_when: false diff --git a/roles/mail_forwarder/molecule/default/molecule.yml b/roles/mail_forwarder/molecule/default/molecule.yml index 67db5205e686a348d31f66d2672b439e5f0e19b2..ad9fe929a026532fe5529057450f44a4aae200d8 100644 --- a/roles/mail_forwarder/molecule/default/molecule.yml +++ b/roles/mail_forwarder/molecule/default/molecule.yml @@ -81,6 +81,7 @@ provisioner: config_options: defaults: force_valid_group_names: "ignore" + interpreter_python: "/usr/bin/python3" ssh_connection: pipelining: "True" lint: diff --git a/roles/mail_forwarder/molecule/default/prepare.yml b/roles/mail_forwarder/molecule/default/prepare.yml index d03a7e104b95a78cc37fe3cba4de1b77124ccc4f..55241e8a781ee8705af81f74bdca332cbccff801 100644 --- a/roles/mail_forwarder/molecule/default/prepare.yml +++ b/roles/mail_forwarder/molecule/default/prepare.yml @@ -5,7 +5,7 @@ gather_facts: false tasks: - name: Install python for Ansible - raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal) + raw: test -e /usr/bin/python3 || (apt -y update && apt install -y python3-minimal) become: true changed_when: false diff --git a/roles/mail_server/molecule/default/molecule.yml b/roles/mail_server/molecule/default/molecule.yml index 4b60e8971c08fe43fe887ee189818cf620efd23c..acf4b72d4db28dc4df5fae4aa9daf6a91cefa641 100644 --- a/roles/mail_server/molecule/default/molecule.yml +++ b/roles/mail_server/molecule/default/molecule.yml @@ -83,6 +83,7 @@ provisioner: config_options: defaults: force_valid_group_names: "ignore" + interpreter_python: "/usr/bin/python3" ssh_connection: pipelining: "True" lint: diff --git a/roles/mail_server/molecule/default/prepare.yml b/roles/mail_server/molecule/default/prepare.yml index 3e101af58cae68e5eb89f80904878d89448c1d78..cc8bb7b93985bdba2b274433a0289a97042ff279 100644 --- a/roles/mail_server/molecule/default/prepare.yml +++ b/roles/mail_server/molecule/default/prepare.yml @@ -5,7 +5,7 @@ gather_facts: false tasks: - name: Install python for Ansible - raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal) + raw: test -e /usr/bin/python3 || (apt -y update && apt install -y python3-minimal) become: true changed_when: false diff --git a/roles/php_website/molecule/default/molecule.yml b/roles/php_website/molecule/default/molecule.yml index 89b9a555c9bd4b277f94abe6ad9d912153b1b703..2d738c3b12fc4562911c946cef62a3fa5a1a74a5 100644 --- a/roles/php_website/molecule/default/molecule.yml +++ b/roles/php_website/molecule/default/molecule.yml @@ -28,6 +28,7 @@ provisioner: config_options: defaults: force_valid_group_names: "ignore" + interpreter_python: "/usr/bin/python3" ssh_connection: pipelining: "True" lint: diff --git a/roles/php_website/molecule/default/prepare.yml b/roles/php_website/molecule/default/prepare.yml index 4b47547e8ff5e7ad4f4d0b1c861653b74e35737d..4e8a11ae1535d52d968467817d132af06e83770a 100644 --- a/roles/php_website/molecule/default/prepare.yml +++ b/roles/php_website/molecule/default/prepare.yml @@ -5,7 +5,7 @@ gather_facts: false tasks: - name: Install python for Ansible - raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal) + raw: test -e /usr/bin/python3 || (apt -y update && apt install -y python3-minimal) become: true changed_when: false diff --git a/roles/preseed/molecule/default/molecule.yml b/roles/preseed/molecule/default/molecule.yml index ce6d6d3815d03f700dc4eb404c3ea479fa320266..9fced0c5c12245f2e6ecdfa2a3b3eba373c1e77c 100644 --- a/roles/preseed/molecule/default/molecule.yml +++ b/roles/preseed/molecule/default/molecule.yml @@ -40,6 +40,7 @@ provisioner: config_options: defaults: force_valid_group_names: "ignore" + interpreter_python: "/usr/bin/python3" ssh_connection: pipelining: "True" lint: diff --git a/roles/preseed/molecule/default/prepare.yml b/roles/preseed/molecule/default/prepare.yml index a21b50d8757ea4235f69de635f118c5f2f1f7052..63c17ebc5020146c4e81eb768f2260edeed18f3b 100644 --- a/roles/preseed/molecule/default/prepare.yml +++ b/roles/preseed/molecule/default/prepare.yml @@ -5,7 +5,7 @@ gather_facts: false tasks: - name: Install python for Ansible - raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal) + raw: test -e /usr/bin/python3 || (apt -y update && apt install -y python3-minimal) become: true changed_when: false diff --git a/roles/web_server/molecule/default/molecule.yml b/roles/web_server/molecule/default/molecule.yml index a13fb68396e2c6bafdcb155cd2948db317a5aaa6..5484d99c68ef8c1b9b2a0c60a02f95eee9d3311f 100644 --- a/roles/web_server/molecule/default/molecule.yml +++ b/roles/web_server/molecule/default/molecule.yml @@ -58,6 +58,7 @@ provisioner: config_options: defaults: force_valid_group_names: "ignore" + interpreter_python: "/usr/bin/python3" ssh_connection: pipelining: "True" lint: diff --git a/roles/web_server/molecule/default/prepare.yml b/roles/web_server/molecule/default/prepare.yml index faad65329ba259dfa26b4add04bdd68d8bbd6c11..d0023d88b42afe30f7dbfbbc44626c58b2e08757 100644 --- a/roles/web_server/molecule/default/prepare.yml +++ b/roles/web_server/molecule/default/prepare.yml @@ -5,7 +5,7 @@ gather_facts: false tasks: - name: Install python for Ansible - raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal) + raw: test -e /usr/bin/python3 || (apt -y update && apt install -y python3-minimal) become: true changed_when: false diff --git a/roles/wsgi_website/molecule/default/molecule.yml b/roles/wsgi_website/molecule/default/molecule.yml index 1390b652ad9e5375ce15839307e591fcbb205a35..bf649f402aec5e01ce6a45e39d89a6b5a435d455 100644 --- a/roles/wsgi_website/molecule/default/molecule.yml +++ b/roles/wsgi_website/molecule/default/molecule.yml @@ -29,6 +29,7 @@ provisioner: config_options: defaults: force_valid_group_names: "ignore" + interpreter_python: "/usr/bin/python3" ssh_connection: pipelining: "True" lint: diff --git a/roles/wsgi_website/molecule/default/prepare.yml b/roles/wsgi_website/molecule/default/prepare.yml index 96e7a8518615b9ae8e567204f19f649c5d62ff39..0d8c75ceb109154acf19916aa3f1c27008984f1f 100644 --- a/roles/wsgi_website/molecule/default/prepare.yml +++ b/roles/wsgi_website/molecule/default/prepare.yml @@ -5,7 +5,7 @@ gather_facts: false tasks: - name: Install python for Ansible - raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal) + raw: test -e /usr/bin/python3 || (apt -y update && apt install -y python3-minimal) become: true changed_when: false diff --git a/roles/xmpp_server/molecule/default/molecule.yml b/roles/xmpp_server/molecule/default/molecule.yml index 09e8fde27880ce780a1455e20ce455b8cff94195..1919a1d306fa228098f69f7bf23825c8a7f6fb6f 100644 --- a/roles/xmpp_server/molecule/default/molecule.yml +++ b/roles/xmpp_server/molecule/default/molecule.yml @@ -68,6 +68,7 @@ provisioner: config_options: defaults: force_valid_group_names: "ignore" + interpreter_python: "/usr/bin/python3" ssh_connection: pipelining: "True" lint: diff --git a/roles/xmpp_server/molecule/default/prepare.yml b/roles/xmpp_server/molecule/default/prepare.yml index bf3315ff21df2e81d5babd18b4aa8f6ba4836829..3c589d551c745240b03738ba3c3525366b53447b 100644 --- a/roles/xmpp_server/molecule/default/prepare.yml +++ b/roles/xmpp_server/molecule/default/prepare.yml @@ -5,7 +5,7 @@ gather_facts: false tasks: - name: Install python for Ansible - raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal) + raw: test -e /usr/bin/python3 || (apt -y update && apt install -y python3-minimal) become: true changed_when: false