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

Merge pull request #754 from jfindlay/suse

Browse source 
Merge #734
This commit is contained in:
Justin Findlay 2016-02-05 21:04:47 -07:00
commit 08aec13dec
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
bootstrap-salt.sh
View file

@ -4487,11 +4487,11 @@ install_opensuse_stable_deps() {
fi
# Is the repository already known
opensuse_deps_repo_url="http://download.opensuse.org/repositories/devel:/languages:/python/${DISTRO_REPO}/"
opensuse_deps_repo_url="http://download.opensuse.org/repositories/systemsmanagement:saltstack/${DISTRO_REPO}/systemsmanagement:saltstack.repo"
__zypper repos --details | grep "${opensuse_deps_repo_url}" >/dev/null 2>&1
if [ $? -eq 1 ]; then
# zypper does not yet know nothing about devel_languages_python
__zypper addrepo --refresh "${opensuse_deps_repo_url}" devel_languages_python || return 1
# zypper does not yet know nothing about systemsmanagement_saltstack
__zypper addrepo --refresh "${opensuse_deps_repo_url}" systemsmanagement_saltstack || return 1
fi
__zypper --gpg-auto-import-keys refresh
@ -4731,7 +4731,7 @@ install_suse_12_stable_deps() {
# Salt needs python-zypp installed in order to use the zypper module
__PACKAGES="python-zypp"
# shellcheck disable=SC2089
__PACKAGES="${__PACKAGES} libzmq3 python python-Jinja2 python-msgpack-python"
__PACKAGES="${__PACKAGES} libzmq5 python python-Jinja2 python-msgpack-python"
__PACKAGES="${__PACKAGES} python-pycrypto python-pyzmq python-pip python-xml python-requests"
if [ "$SUSE_PATCHLEVEL" -eq 1 ]; then
@ -4901,11 +4901,11 @@ install_suse_11_stable_deps() {
DISTRO_REPO="SLE_${DISTRO_MAJOR_VERSION}${DISTRO_PATCHLEVEL}"
# Is the repository already known
__zypper repos | grep devel_languages_python >/dev/null 2>&1
__zypper repos | grep systemsmanagement_saltstack >/dev/null 2>&1
if [ $? -eq 1 ]; then
# zypper does not yet know nothing about devel_languages_python
# zypper does not yet know nothing about systemsmanagement_saltstack
__zypper addrepo --refresh \
"http://download.opensuse.org/repositories/devel:/languages:/python/${DISTRO_REPO}/devel:languages:python.repo" || return 1
"http://download.opensuse.org/repositories/systemsmanagement:saltstack/${DISTRO_REPO}/systemsmanagement:saltstack.repo" || return 1
fi
__zypper --gpg-auto-import-keys refresh || return 1
@ -4917,7 +4917,7 @@ install_suse_11_stable_deps() {
# Salt needs python-zypp installed in order to use the zypper module
__PACKAGES="python-zypp"
# shellcheck disable=SC2089
__PACKAGES="${__PACKAGES} libzmq3 python python-Jinja2 python-msgpack-python"
__PACKAGES="${__PACKAGES} libzmq5 python python-Jinja2 python-msgpack-python"
__PACKAGES="${__PACKAGES} python-pycrypto python-pyzmq python-pip python-xml python-requests"
if [ "$SUSE_PATCHLEVEL" -eq 1 ]; then