From bb709dc9d517c6a3bb17038ac811f6ea6f99527f Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sat, 2 Nov 2019 04:43:10 -0500 Subject: [PATCH] #2025 #2026 got the package name wrong --- roles/2-common/tasks/packages.yml | 7 ------- scripts/ansible | 3 ++- scripts/ansible-2.8.x | 3 ++- scripts/ansible-2.9.x | 3 ++- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/roles/2-common/tasks/packages.yml b/roles/2-common/tasks/packages.yml index 35f55f499..89b3bad4e 100644 --- a/roles/2-common/tasks/packages.yml +++ b/roles/2-common/tasks/packages.yml @@ -63,10 +63,3 @@ - usbutils - wget state: present - -# 2019-10-31: roles/kalite crashed without the following python-virtualenv -- weirdly python3-virtualenv was installed on Raspbian (not sure why) but insufficient -- name: Install package python-virtualenv for KA Lite and Calibre-Web, on older OS's (raspbian-9, raspbian-10, debian-9, debian-10, ubuntu-16, ubuntu-18) - package: - name: python-virtualenv - state: present - when: is_raspbian_9 or is_raspbian_10 or is_debian_9 or is_debian_10 or is_ubuntu_16 or is_ubuntu_18 diff --git a/scripts/ansible b/scripts/ansible index 7d60c147c..7fbf6dbf4 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -76,7 +76,8 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian echo -e "\napt update; apt install ansible and python3 dependencies\n" apt update - apt -y --allow-downgrades install ansible python3-distutils python3-mysqldb python3-passlib python3-pip python3-setuptools python3-virtualenv python3-psycopg2 + apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 python3-passlib\ + python3-pip python3-setuptools virtualenv # (pulls in python3-distutils python3-virtualenv) echo -e "\nSUCCESS: verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n" diff --git a/scripts/ansible-2.8.x b/scripts/ansible-2.8.x index f789c965f..cb9d73865 100755 --- a/scripts/ansible-2.8.x +++ b/scripts/ansible-2.8.x @@ -76,7 +76,8 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian echo -e "\napt update; apt install ansible and python3 dependencies\n" apt update - apt -y --allow-downgrades install ansible python3-distutils python3-mysqldb python3-passlib python3-pip python3-setuptools python3-virtualenv python3-psycopg2 + apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 python3-passlib\ + python3-pip python3-setuptools virtualenv # (pulls in python3-distutils python3-virtualenv) echo -e "\nSUCCESS: verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n" # TEMPORARILY USE ANSIBLE 2.4.4 (REMOVE IT WITH "pip uninstall ansible") diff --git a/scripts/ansible-2.9.x b/scripts/ansible-2.9.x index f33f00960..3b85ddf14 100755 --- a/scripts/ansible-2.9.x +++ b/scripts/ansible-2.9.x @@ -76,7 +76,8 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian echo -e "\napt update; apt install ansible and python3 dependencies\n" apt update - apt -y --allow-downgrades install ansible python3-distutils python3-mysqldb python3-passlib python3-pip python3-setuptools python3-virtualenv python3-psycopg2 + apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 python3-passlib\ + python3-pip python3-setuptools virtualenv # (pulls in python3-distutils python3-virtualenv) echo -e "\nSUCCESS: verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n" # TEMPORARILY USE ANSIBLE 2.4.4 (REMOVE IT WITH "pip uninstall ansible")