Bug fixes 2.x pr 2.x

roles/debian/ldap_server/tasks/main.yml

@@ -14,6 +14,19 @@
     purge: true
   when: ldap_server.slapd.purge
 
+- name: Set up Python packages.
+  ansible.builtin.include_role:
+    name: debian/python_common
+  vars:
+    python_common:
+      remove_packages:
+        - python-pip
+        - python3-yaml
+        - python-botocore
+        - python-urllib3
+      install_packages:
+        - python3-pip
+
 - name: Ensure LDAP and python-ldap and dependencies are installed.
   ansible.builtin.apt:
     pkg: ["slapd", "ldapscripts", "libldap2-dev"]

roles/debian/mysql_client/tasks/main.yml

@@ -6,6 +6,19 @@
     update_cache: true
     cache_valid_time: 240
 
+- name: Set up Python packages.
+  ansible.builtin.include_role:
+    name: debian/python_common
+  vars:
+    python_common:
+      remove_packages:
+        - python-pip
+        - python3-yaml
+        - python-botocore
+        - python-urllib3
+      install_packages:
+        - python3-pip
+
 - name: Ensure PyMySQL is installed with pip3.
   ansible.builtin.pip:
     name: pymysql

roles/debian/nginx/tasks/main.yml

@@ -6,6 +6,19 @@
     update_cache: true
     cache_valid_time: 240
 
+- name: Set up Python packages.
+  ansible.builtin.include_role:
+    name: debian/python_common
+  vars:
+    python_common:
+      remove_packages:
+        - python-pip
+        - python3-yaml
+        - python-botocore
+        - python-urllib3
+      install_packages:
+        - python3-pip
+
 - name: Ensure passlib is installed with pip3.
   ansible.builtin.pip:
     name: passlib

roles/debian/python_common/defaults/main.yml

@@ -8,5 +8,4 @@ python_common:
   install_packages:
     - python3-distutils
     - python3-venv
-    - python3-pip
     - cloud-init # package can get removed with python3-yaml but we need it for auto-scale

scripts/_common.sh

@@ -12,6 +12,7 @@ TARGET_PROVISION_BRANCH=""
 ANSIBLE_EXTRA_VARS=""
 ANSIBLE_DEFAULT_EXTRA_VARS=""
 ANSIBLE_PATH=""
+PYTHON_INTERPRETER=""
 BUILD_WORKSPACE=""
 BUILD_WORKSPACE_BASE="$OWN_DIR/build"
 BUILD_ID=""
@@ -101,6 +102,10 @@ parse_options(){
           shift
           ANSIBLE_PATH="$1"
         ;;
+      "--python-interpreter")
+          shift
+          PYTHON_INTERPRETER="$1"
+        ;;
         *)
         usage
         exit 1
@@ -123,7 +128,11 @@ get_build_workspace(){
 # Common extra-vars to pass to Ansible.
 get_ansible_defaults_vars(){
   get_build_id
-  ANSIBLE_DEFAULT_EXTRA_VARS="{_ce_provision_base_dir: $OWN_DIR, _ce_provision_build_dir: $BUILD_WORKSPACE, _ce_provision_build_tmp_dir: $BUILD_TMP_DIR, _ce_provision_data_dir: $ANSIBLE_DATA_DIR, _ce_provision_build_id: $BUILD_ID, _ce_provision_force_play: $FORCE_PLAY, target_branch: $TARGET_PROVISION_BRANCH}"
+  if [ -n "$PYTHON_INTERPRETER" ]; then
+    ANSIBLE_DEFAULT_EXTRA_VARS="{ansible_python_interpreter: $PYTHON_INTERPRETER, _ce_provision_base_dir: $OWN_DIR, _ce_provision_build_dir: $BUILD_WORKSPACE, _ce_provision_build_tmp_dir: $BUILD_TMP_DIR, _ce_provision_data_dir: $ANSIBLE_DATA_DIR, _ce_provision_build_id: $BUILD_ID, _ce_provision_force_play: $FORCE_PLAY, target_branch: $TARGET_PROVISION_BRANCH}"
+  else
+    ANSIBLE_DEFAULT_EXTRA_VARS="{_ce_provision_base_dir: $OWN_DIR, _ce_provision_build_dir: $BUILD_WORKSPACE, _ce_provision_build_tmp_dir: $BUILD_TMP_DIR, _ce_provision_data_dir: $ANSIBLE_DATA_DIR, _ce_provision_build_id: $BUILD_ID, _ce_provision_force_play: $FORCE_PLAY, target_branch: $TARGET_PROVISION_BRANCH}"
+  fi
 }
 
 # Clone our target repo.

scripts/provision.sh

@@ -14,6 +14,7 @@ usage(){
   echo 'Available options:'
   echo '--ansible-extra-vars: Variable to pass as --extra-vars arguments to ansible-playbook. Make sure to escape them properly.'
   echo '--ansible-path: Pass the path to the directory containing the Ansible binaries if you are not using the version of Ansible in PATH.'
+  echo '--python-interpreter: When using Python virtual environments Ansible may not correctly determine the Python interpreter, use this to set it manually.'
   echo '--workspace: Local existing clone of the repo/branch (if your deployment tool already has one). This will skip the cloning/fetching of the repo.'
   echo '--user: Linux user executing the script (defaults to controller).'
   echo '--absolute-playbook-path: Prevent prepending of the workspace path to the playbook path when Ansible is called.'