mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-16 09:40:21 +00:00
correct install
This commit is contained in:
parent
168b6787d8
commit
0031919e8d
1 changed files with 3 additions and 11 deletions
|
@ -4198,33 +4198,25 @@ install_centos_stable_deps() {
|
||||||
if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then
|
if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then
|
||||||
# YAML module is used for generating custom master/minion configs
|
# YAML module is used for generating custom master/minion configs
|
||||||
if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
|
if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
|
||||||
__PACKAGES="${__PACKAGES} python3-pyyaml"
|
__PACKAGES="${__PACKAGES} python3-pyyaml python3-setuptools"
|
||||||
else
|
else
|
||||||
__PACKAGES="${__PACKAGES} python2-pyyaml"
|
__PACKAGES="${__PACKAGES} python2-pyyaml"
|
||||||
fi
|
fi
|
||||||
elif [ "$DISTRO_MAJOR_VERSION" -eq 7 ]; then
|
elif [ "$DISTRO_MAJOR_VERSION" -eq 7 ]; then
|
||||||
# YAML module is used for generating custom master/minion configs
|
# YAML module is used for generating custom master/minion configs
|
||||||
if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
|
if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
|
||||||
__PACKAGES="${__PACKAGES} python36-PyYAML"
|
__PACKAGES="${__PACKAGES} python36-PyYAML python36-setuptools"
|
||||||
else
|
else
|
||||||
__PACKAGES="${__PACKAGES} PyYAML"
|
__PACKAGES="${__PACKAGES} PyYAML"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
# YAML module is used for generating custom master/minion configs
|
# YAML module is used for generating custom master/minion configs
|
||||||
if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
|
if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
|
||||||
__PACKAGES="${__PACKAGES} python34-PyYAML"
|
__PACKAGES="${__PACKAGES} python34-PyYAML python34-setuptools"
|
||||||
else
|
else
|
||||||
__PACKAGES="${__PACKAGES} PyYAML"
|
__PACKAGES="${__PACKAGES} PyYAML"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
else
|
|
||||||
if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
|
|
||||||
if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then
|
|
||||||
__PACKAGES="${__PACKAGES} python3-setuptools"
|
|
||||||
else
|
|
||||||
__PACKAGES="${__PACKAGES} python36-setuptools"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
|
|
Loading…
Add table
Reference in a new issue