Merge pull request #126 from m0duspwnens/master

add mysql python library and dependencies for py3 salt centos7
This commit is contained in:
Mike Reeves
2019-11-12 09:45:50 -05:00
committed by GitHub

View File

@@ -357,7 +357,7 @@ docker_install() {
yum -y update yum -y update
yum -y install docker-ce yum -y install docker-ce
pip3 install docker pip3 install docker
set_environment_var "PYTHONPATH=$PYTHONPATH:/usr/local/lib/python3.6/site-packages/" set_environment_var "PYTHONPATH=$PYTHONPATH:/usr/local/lib/python3.6/site-packages/:/usr/local/lib64/python3.6/site-packages/"
if [ $INSTALLTYPE != 'EVALMODE' ]; then if [ $INSTALLTYPE != 'EVALMODE' ]; then
docker_registry docker_registry
fi fi
@@ -984,6 +984,13 @@ salt_master_directories() {
} }
salt_install_mysql_deps() {
yum -y install gcc mariadb-devel python3-devel
pip3 install mysqlclient
}
sensor_pillar() { sensor_pillar() {
SENSORPILLARPATH=$TMP/pillar/sensors SENSORPILLARPATH=$TMP/pillar/sensors
@@ -1888,6 +1895,8 @@ if (whiptail_you_sure); then
# Install salt and dependencies # Install salt and dependencies
{ {
sleep 0.5 sleep 0.5
echo -e "XXX\n1\nInstalling mysql dependencies for saltstack... \nXXX"
salt_install_mysql_deps >> $SETUPLOG 2>&1
echo -e "XXX\n0\nInstalling and configuring Salt... \nXXX" echo -e "XXX\n0\nInstalling and configuring Salt... \nXXX"
echo " ** Installing Salt and Dependencies **" >> $SETUPLOG echo " ** Installing Salt and Dependencies **" >> $SETUPLOG
saltify >> $SETUPLOG 2>&1 saltify >> $SETUPLOG 2>&1
@@ -2122,6 +2131,8 @@ if (whiptail_you_sure); then
sleep 0.5 sleep 0.5
echo -e "XXX\n0\nCreating Bond Interface... \nXXX" echo -e "XXX\n0\nCreating Bond Interface... \nXXX"
network_setup >> $SETUPLOG 2>&1 network_setup >> $SETUPLOG 2>&1
echo -e "XXX\n1\nInstalling mysql dependencies for saltstack... \nXXX"
salt_install_mysql_deps >> $SETUPLOG 2>&1
echo -e "XXX\n1\nInstalling saltstack... \nXXX" echo -e "XXX\n1\nInstalling saltstack... \nXXX"
saltify >> $SETUPLOG 2>&1 saltify >> $SETUPLOG 2>&1
echo -e "XXX\n3\nInstalling docker... \nXXX" echo -e "XXX\n3\nInstalling docker... \nXXX"