saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 17:50:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing some lint issues.

Browse source
This commit is contained in:
Gareth J. Greenaway 2022-07-22 12:41:34 -07:00
parent ed00a6c9b0
commit f097386319
No known key found for this signature in database
GPG key ID: 10B62F8A7CAD7A41
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bootstrap-salt.sh
View file

@ -3550,7 +3550,7 @@ __install_saltstack_debian_repository() {
}
__install_saltstack_debian_tiamat_repository() {
DEBIAN_RELEASE="$DISTRO_MAJORtiamat__VERSION"
DEBIAN_RELEASE="$DISTRO_MAJOR_VERSION"
DEBIAN_CODENAME="$DISTRO_CODENAME"
__PY_VERSION_REPO="apt"
@ -4377,7 +4377,7 @@ __install_epel_repository() {
# Download latest 'epel-release' package for the distro version directly
epel_repo_url="${HTTP_VAL}://dl.fedoraproject.org/pub/epel/epel-release-latest-${DISTRO_MAJOR_VERSION}.noarch.rpm"
yum -y install ${epel_next_repo_url} ${epel_repo_url}
yum -y install "${epel_next_repo_url}" "${epel_repo_url}"
_EPEL_REPOS_INSTALLED=$BS_TRUE
@ -8572,8 +8572,9 @@ daemons_running_tiamat() {
[ $fname = "master" ] && [ "$_INSTALL_MASTER" -eq $BS_FALSE ] && continue
[ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue
if [ '$(ps wwwaux | grep -v grep | grep "/opt/saltstack/salt/run/run $fname")' = "" ]; then
echoerror "salt-$fname was not found running"
salt_path="/opt/saltstack/salt/run/run"
if [ "$(ps wwwaux | grep -v grep | grep $salt_path | grep $fname)" = "" ]; then
echoerror "$salt_process was not found running"
FAILED_DAEMONS=$((FAILED_DAEMONS + 1))
fi
done