[Fix] Remove mysql salt dep function calls from so-setup

This commit is contained in:
William Wernert
2020-04-18 18:38:24 -04:00
parent 1ac29c6fbe
commit 63fd274106

View File

@@ -337,7 +337,6 @@ if (whiptail_you_sure) ; then
configure_minion master >> $SETUPLOG 2>&1 configure_minion master >> $SETUPLOG 2>&1
echo " ** Installing Salt Master **" >> $SETUPLOG echo " ** Installing Salt Master **" >> $SETUPLOG
install_master >> $SETUPLOG 2>&1 install_master >> $SETUPLOG 2>&1
salt_install_mysql_deps >> $SETUPLOG 2>&1
salt_master_directories >> $SETUPLOG 2>&1 salt_master_directories >> $SETUPLOG 2>&1
update_sudoers >> $SETUPLOG 2>&1 update_sudoers >> $SETUPLOG 2>&1
chown_salt_master >> $SETUPLOG 2>&1 chown_salt_master >> $SETUPLOG 2>&1
@@ -606,8 +605,6 @@ if (whiptail_you_sure) ; then
docker_install >> $SETUPLOG 2>&1 docker_install >> $SETUPLOG 2>&1
echo -e "XXX\n5\nInstalling master code... \nXXX" echo -e "XXX\n5\nInstalling master code... \nXXX"
install_master >> $SETUPLOG 2>&1 install_master >> $SETUPLOG 2>&1
echo -e "XXX\n5\nInstalling mysql dependencies for saltstack... \nXXX"
salt_install_mysql_deps >> $SETUPLOG 2>&1
echo -e "XXX\n6\nCopying salt code... \nXXX" echo -e "XXX\n6\nCopying salt code... \nXXX"
salt_master_directories >> $SETUPLOG 2>&1 salt_master_directories >> $SETUPLOG 2>&1
echo -e "XXX\n6\nupdating suduers... \nXXX" echo -e "XXX\n6\nupdating suduers... \nXXX"
@@ -960,8 +957,6 @@ if (whiptail_you_sure) ; then
set_initial_firewall_policy >> $SETUPLOG 2>&1 set_initial_firewall_policy >> $SETUPLOG 2>&1
#echo -e "XXX\n4\nGenerating Fleet Pillar... \nXXX" #echo -e "XXX\n4\nGenerating Fleet Pillar... \nXXX"
fleet_pillar >> $SETUPLOG 2>&1 fleet_pillar >> $SETUPLOG 2>&1
echo -e "XXX\n5\nInstalling mysql dependencies for saltstack... \nXXX"
salt_install_mysql_deps >> $SETUPLOG 2>&1
echo "** Generating the patch pillar **" >> $SETUPLOG echo "** Generating the patch pillar **" >> $SETUPLOG
patch_pillar >> $SETUPLOG 2>&1 patch_pillar >> $SETUPLOG 2>&1
node_pillar >> $SETUPLOG 2>&1 node_pillar >> $SETUPLOG 2>&1