Commit db183ab8 authored by Alain Takoudjou's avatar Alain Takoudjou Committed by Thomas Gambier

Remove easy_install in deploy script and use pip instead

python-easyinstall is not a package anymore in Ubuntu 18.10

/reviewed-on nexedi/slapos.core!104
parents 60bf7c18 695fb2fa
......@@ -40,7 +40,7 @@ fi
# Warn users who aren't on an explicitly supported distro, but allow them to
# override check and attempt installation with ``export FORCE=yes``
if [[ ! ${DISTRO} =~ (wheezy|jessie|trusty|vivid|xenial|rhel7|rhel6|LinuxMint-17.2|f20|f19|f26|artful|stretch) ]]; then
if [[ ! ${DISTRO} =~ (wheezy|jessie|trusty|vivid|xenial|bionic|rhel7|rhel6|LinuxMint-17.2|f20|f19|f26|artful|stretch) ]]; then
echo "WARNING: this script has not been tested on $DISTRO"
if [[ "$FORCE" != "yes" ]]; then
die $LINENO "If you wish to run this script anyway run with FORCE=yes"
......@@ -126,7 +126,7 @@ is_package_installed unzip || install_package unzip
is_package_installed openssl || install_package openssl
is_package_installed ansible || install_package ansible
is_package_installed python-setuptools || install_package python-setuptools
is_package_installed python-pip || install_package python-pip
if is_fedora && [[ $DISTRO == "f26" ]]; then
is_package_installed python2-rpm || install_package python2-rpm
......@@ -237,8 +237,8 @@ class CallbackModule(baseModule):
EOF
ansible localhost -m easy_install -a name=slapcache --connection=local
ansible localhost -m easy_install -a name=requests --connection=local
ansible localhost -m pip -a name=slapcache --connection=local
ansible localhost -m pip -a name=requests --connection=local
if [ ! -f /usr/share/ansible_plugins/mitogen.zip ]; then
wget -O /usr/share/ansible_plugins/mitogen.zip https://github.com/dw/mitogen/archive/2d7821b824a77930812847c87ea385cf37198c3f.zip
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment