From f05fcc271f44d6072533ca3266fb89802cb6ebdb Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Mon, 18 Nov 2019 12:45:12 -0500
Subject: [PATCH] Trying using packages vs pip for centos

---
 so-setup-network.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/so-setup-network.sh b/so-setup-network.sh
index 59e4437fc..8618553eb 100644
--- a/so-setup-network.sh
+++ b/so-setup-network.sh
@@ -359,8 +359,8 @@ docker_install() {
     if [ $INSTALLTYPE != 'EVALMODE'  ]; then
       docker_registry
     fi
-    echo "Using pip3 to install docker-py for salt"
-    pip3 install -t /usr/lib/python3.6/site-packages/ docker
+    #echo "Using pip3 to install docker-py for salt"
+    #pip3 install -t /usr/lib/python3.6/site-packages/ docker
     echo "Restarting Docker" >> $SETUPLOG 2>&1
     systemctl restart docker
     systemctl enable docker
@@ -493,7 +493,8 @@ install_pip3() {
   if [ $OS == 'ubuntu' ]; then
     apt-get -y install python3-pip gcc python3-dev
   elif [ $OS == 'centos' ]; then
-    yum -y install python3-pip gcc python3-devel
+    #yum -y install python3-pip gcc python3-devel
+    yum -y install epel-release python3 python36-dateutil python36-m2crypto python36-mysql python36-docker
   fi
 
 }
@@ -868,8 +869,8 @@ EOF
       fi
     fi
 
-    echo "Using pip3 to install python-dateutil for salt"
-    pip3 install -t /usr/lib/python3.6/site-packages/ python-dateutil
+    #echo "Using pip3 to install python-dateutil for salt"
+    #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*
@@ -1010,8 +1011,8 @@ salt_install_mysql_deps() {
 
   if [ $OS == 'centos' ]; then
     yum -y install mariadb-devel
-    echo "Using pip3 to install mysqlclient for salt"
-    pip3 install -t /usr/lib64/python3.6/site-packages/ mysqlclient
+    #echo "Using pip3 to install mysqlclient for salt"
+    #pip3 install -t /usr/lib64/python3.6/site-packages/ mysqlclient
   elif [ $OS == 'ubuntu' ]; then
     apt-get -y install libmysqlclient-dev
     echo "Using pip3 to install mysqlclient for salt"