fix pip and python-influxdb install

This commit is contained in:
m0duspwnens
2021-03-09 11:50:27 -05:00
parent a3a0af64ce
commit c1e4c4cb30

View File

@@ -1917,7 +1917,8 @@ saltify() {
reserve_group_ids >> "$setup_log" 2>&1
if [[ ! $is_iso ]]; then
logCmd "yum -y install epel-release"
logCmd "yum -y install sqlite argon2 curl mariadb-devel"
logCmd "yum -y install sqlite argon2 curl mariadb-devel python3-pip"
retry 50 10 "pip3 install --user influxdb" >> "$setup_log" 2>&1 || exit 1
fi
# Download Ubuntu Keys in case manager updates = 1
mkdir -p /opt/so/gpg >> "$setup_log" 2>&1
@@ -2032,7 +2033,6 @@ saltify() {
set_progress_str 7 'Installing salt-master'
retry 50 10 "apt-get -y install salt-master=3002.5+ds-1" >> "$setup_log" 2>&1 || exit 1
retry 50 10 "apt-mark hold salt-master" >> "$setup_log" 2>&1 || exit 1
retry 50 10 "pip3 install --user influxdb" >> "$setup_log" 2>&1 || exit 1
;;
*)
# Copy down the gpg keys and install them from the manager
@@ -2054,7 +2054,7 @@ saltify() {
if [[ $OSVER != 'xenial' ]]; then
retry 50 10 "apt-get -y install python3-pip python3-dateutil python3-m2crypto python3-mysqldb python3-influxdb" >> "$setup_log" 2>&1 || exit 1
else
retry 50 10 "apt-get -y install python-pip python-dateutil python-m2crypto python-mysqldb" >> "$setup_log" 2>&1 || exit 1
retry 50 10 "apt-get -y install python-pip python-dateutil python-m2crypto python-mysqldb python-influxdb" >> "$setup_log" 2>&1 || exit 1
fi
fi
}