diff --git a/so-setup-network.sh b/so-setup-network.sh index ee8f932bc..bfdcad7a9 100644 --- a/so-setup-network.sh +++ b/so-setup-network.sh @@ -356,8 +356,7 @@ docker_install() { yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo yum -y update yum -y install docker-ce - pip3 install docker - set_environment_var "PYTHONPATH=$PYTHONPATH:/usr/local/lib/python3.6/site-packages/:/usr/local/lib64/python3.6/site-packages/" + pip3 install -t /usr/lib/python3.6/site-packages/ docker if [ $INSTALLTYPE != 'EVALMODE' ]; then docker_registry fi @@ -850,7 +849,7 @@ EOF fi fi - pip3 install python-dateutil + pip3 install -t /usr/lib/python3.6/site-packages/ python-dateutil yum clean expire-cache yum -y install salt-minion-2019.2.2 yum-utils device-mapper-persistent-data lvm2 openssl yum -y update exclude=salt* @@ -988,7 +987,7 @@ salt_master_directories() { salt_install_mysql_deps() { yum -y install gcc mariadb-devel python3-devel - pip3 install mysqlclient + pip3 install -t /usr/lib64/python3.6/site-packages/ mysqlclient } @@ -1038,7 +1037,7 @@ set_environment_var() { echo "Setting environment variable: $1" export "$1" - echo "export $1" >> /etc/profile.d/set_env_vars.sh + echo "$1" >> /etc/environment }