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

Properly handle CentOS/RHEL 5 git installations. Fixes #46.

Browse source
This commit is contained in:
Pedro Algarvio 2013-02-12 22:44:12 +00:00
parent 7d6f9ebdfc
commit 7547407c85
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
bootstrap-salt.sh
View file

@ -1007,7 +1007,13 @@ install_centos_stable_start_daemons() {
install_centos_git_deps() {
install_centos_stable_deps
yum -y install git PyYAML m2crypto python-crypto python-msgpack python-zmq python-jinja2 --enablerepo=epel-testing
if [ $DISTRO_MAJOR_VERSION -eq 5 ]; then
yum -y install git PyYAML python26-m2crypto m2crypto python26 python26-crypto \
python26-msgpack python26-zmq python26-jinja2 --enablerepo=epel-testing
else
yum -y install git PyYAML m2crypto python-crypto python-msgpack python-zmq \
python-jinja2 --enablerepo=epel-testing
fi
__git_clone_and_checkout
@ -1020,10 +1026,11 @@ install_centos_git_deps() {
}
install_centos_git() {
rm -rf /usr/lib/python*/site-packages/salt
rm -rf /usr/bin/salt*
python2 setup.py install
if [ $DISTRO_MAJOR_VERSION -eq 5 ]; then
python2.6 setup.py install
else
python2 setup.py install
fi
}
install_centos_git_post() {