From a2c3e2461423c9876f6f1a60258ec69919611305 Mon Sep 17 00:00:00 2001 From: Ari Aosved Date: Mon, 22 Dec 2014 17:23:14 -0800 Subject: [PATCH 01/22] libzmq3(.2.3) has moved from unstable to backports in debian 7 --- bootstrap-salt.sh | 47 +++++++---------------------------------------- 1 file changed, 7 insertions(+), 40 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index bc6c5eb..50e97fc 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2102,46 +2102,13 @@ install_debian_7_deps() { # shellcheck disable=SC2086 wget $_WGET_ARGS -q http://debian.saltstack.com/debian-salt-team-joehealy.gpg.key -O - | apt-key add - || return 1 - if [ "$_PIP_ALLOWED" -eq $BS_TRUE ]; then - echowarn "PyZMQ will be installed from PyPI in order to compile it against ZMQ3" - echowarn "This is required for long term stable minion connections to the master." - echowarn "YOU WILL END UP WITH QUITE A FEW PACKAGES FROM DEBIAN UNSTABLE" - echowarn "Sleeping for 5 seconds so you can cancel..." - sleep 5 - - if [ ! -f /etc/apt/sources.list.d/debian-unstable.list ]; then - cat <<_eof > /etc/apt/sources.list.d/debian-unstable.list -deb http://ftp.debian.org/debian unstable main -deb-src http://ftp.debian.org/debian unstable main -_eof - - cat <<_eof > /etc/apt/preferences.d/libzmq3-debian-unstable.pref -Package: libzmq3 -Pin: release a=unstable -Pin-Priority: 800 - -Package: libzmq3-dev -Pin: release a=unstable -Pin-Priority: 800 -_eof - fi - - apt-get update - __apt_get_install_noinput -t unstable libzmq3 libzmq3-dev || return 1 - __PACKAGES="build-essential python-dev python-pip python-requests python-apt" - # Additionally install procps and pciutils which allows for Docker boostraps. See 366#issuecomment-39666813 - __PACKAGES="${__PACKAGES} procps pciutils" - # shellcheck disable=SC2086 - __apt_get_install_noinput ${__PACKAGES} || return 1 - else - apt-get update || return 1 - __PACKAGES="python-zmq python-requests python-apt" - # Additionally install procps and pciutils which allows for Docker boostraps. See 366#issuecomment-39666813 - __PACKAGES="${__PACKAGES} procps pciutils" - # shellcheck disable=SC2086 - __apt_get_install_noinput ${__PACKAGES} || return 1 - - fi + apt-get update || return 1 + __apt_get_install_noinput -t wheezy-backports libzmq3 libzmq3-dev || return 1 + __PACKAGES="build-essential python-dev python-pip python-requests python-apt" + # Additionally install procps and pciutils which allows for Docker boostraps. See 366#issuecomment-39666813 + __PACKAGES="${__PACKAGES} procps pciutils" + # shellcheck disable=SC2086 + __apt_get_install_noinput ${__PACKAGES} || return 1 if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then check_pip_allowed "You need to allow pip based installations (-P) in order to install apache-libcloud" From 3a3662de07c95585524d9114ee9ee8fc65c40714 Mon Sep 17 00:00:00 2001 From: Ari Aosved Date: Tue, 23 Dec 2014 12:47:24 -0800 Subject: [PATCH 02/22] python-requests needs to come from backports as well for >= 2, move pip install under pip check --- bootstrap-salt.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 50e97fc..0421b51 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1957,8 +1957,6 @@ install_debian_deps() { # Additionally install procps and pciutils which allows for Docker boostraps. See 366#issuecomment-39666813 __PACKAGES="${__PACKAGES} python-pip" __PIP_PACKAGES="${__PIP_PACKAGES} requests" - else - __PACKAGES="${__PACKAGES} python-requests" fi # shellcheck disable=SC2086 @@ -2103,15 +2101,16 @@ install_debian_7_deps() { wget $_WGET_ARGS -q http://debian.saltstack.com/debian-salt-team-joehealy.gpg.key -O - | apt-key add - || return 1 apt-get update || return 1 - __apt_get_install_noinput -t wheezy-backports libzmq3 libzmq3-dev || return 1 - __PACKAGES="build-essential python-dev python-pip python-requests python-apt" + __apt_get_install_noinput -t wheezy-backports libzmq3 libzmq3-dev python-zmq python-requests python-apt || return 1 # Additionally install procps and pciutils which allows for Docker boostraps. See 366#issuecomment-39666813 - __PACKAGES="${__PACKAGES} procps pciutils" + __PACKAGES="procps pciutils" # shellcheck disable=SC2086 __apt_get_install_noinput ${__PACKAGES} || return 1 if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then check_pip_allowed "You need to allow pip based installations (-P) in order to install apache-libcloud" + __PACKAGES="build-essential python-dev python-pip" + __apt_get_install_noinput ${__PACKAGES} || return 1 pip install -U "apache-libcloud>=$_LIBCLOUD_MIN_VERSION" fi From 282a91b51254f9de3233a4888c95e93acff3d15f Mon Sep 17 00:00:00 2001 From: Ronald van Zantvoort Date: Tue, 27 Jan 2015 16:26:09 +0100 Subject: [PATCH 03/22] Fix for #535 --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 24975f1..6fa2201 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2573,7 +2573,7 @@ __install_saltstack_copr_zeromq_repository() { else __REPOTYPE="epel" fi - wget -O /etc/yum.repos.d/saltstack-zeromq4.repo \ + __fetch_url -O /etc/yum.repos.d/saltstack-zeromq4.repo \ "http://copr.fedoraproject.org/coprs/saltstack/zeromq4/repo/${__REPOTYPE}-${DISTRO_MAJOR_VERSION}/saltstack-zeromq4-${__REPOTYPE}-${DISTRO_MAJOR_VERSION}.repo" || return 1 fi return 0 From 7a3d1133bfdf272b273053432cc26ef1b408c2bd Mon Sep 17 00:00:00 2001 From: Ronald van Zantvoort Date: Tue, 27 Jan 2015 16:29:01 +0100 Subject: [PATCH 04/22] corrective fix --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 6fa2201..56785c2 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2573,7 +2573,7 @@ __install_saltstack_copr_zeromq_repository() { else __REPOTYPE="epel" fi - __fetch_url -O /etc/yum.repos.d/saltstack-zeromq4.repo \ + __fetch_url /etc/yum.repos.d/saltstack-zeromq4.repo \ "http://copr.fedoraproject.org/coprs/saltstack/zeromq4/repo/${__REPOTYPE}-${DISTRO_MAJOR_VERSION}/saltstack-zeromq4-${__REPOTYPE}-${DISTRO_MAJOR_VERSION}.repo" || return 1 fi return 0 From 3ccd85b3c5ea41f940831d27e761b5a1ccdc1ab4 Mon Sep 17 00:00:00 2001 From: Ronald van Zantvoort Date: Tue, 27 Jan 2015 16:32:44 +0100 Subject: [PATCH 05/22] Fix for #534 --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 24975f1..7e64499 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2567,7 +2567,7 @@ __install_epel_repository() { __install_saltstack_copr_zeromq_repository() { echoinfo "Installing Zeromq >=4 and PyZMQ>=14 from SaltStack's COPR repository" - if [ ! -f /etc/yum.repos.d/saltstack-zeromq4.repo ]; then + if [ ! -s /etc/yum.repos.d/saltstack-zeromq4.repo ]; then if [ "${DISTRO_NAME_L}" = "fedora" ]; then __REPOTYPE="${DISTRO_NAME_L}" else From 09da974d077e650f2e0d2c82bf3fa2d5941c170e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 28 Jan 2015 01:01:11 +0000 Subject: [PATCH 06/22] Update changes log --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2d5bab3..8c04d56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Version 2015.xx.xx: + * Try other tools besides wget when downloading the COPR repo file. Thanks Ronald van + Zantvoort(The-Loeki) + Version 2015.01.12: * Add package upgrades support to FreeBSD. Thanks William Eshagh(eshagl). * Make sure wget is installed on debian bare systems. From 2fdbcd0d0e518ad8a01f60128f0d7f817943a44b Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 28 Jan 2015 01:02:38 +0000 Subject: [PATCH 07/22] Add Ronald van Zantvoort(@The-Loeki) to AUTHORS --- AUTHORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index 3dc80c8..25f9760 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -52,6 +52,7 @@ Pedro Paulo pedropaulovc ptonelli ptonelli Raymond Barbiero visualphoenix Roberto Aguilar rca roberto@baremetal.io +Ronald van Zantvoort The-Loeki ronald@pcextreme.nl Skyler Berg skylerberg skylertheberg@gmail.com Tate Eskew tateeskew Thomas S. Hatch thatch45 thatch45@saltstack.com From e34cee2ab0645e019cc9e41582c7454132fdebca Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 3 Feb 2015 01:33:55 +0000 Subject: [PATCH 08/22] Update changes log --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8c04d56..d7fb872 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ Version 2015.xx.xx: * Try other tools besides wget when downloading the COPR repo file. Thanks Ronald van Zantvoort(The-Loeki) + * No need to install packages from the Unstable repository for debian, use backports. Thanks + Ari Aosved(devaos) Version 2015.01.12: * Add package upgrades support to FreeBSD. Thanks William Eshagh(eshagl). From cd8ea543ee54a90c17cb32b5e8a753c124067824 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 3 Feb 2015 01:34:34 +0000 Subject: [PATCH 09/22] Add Ari Aosved(@devaos) to AUTHORS --- AUTHORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index 25f9760..7639f69 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -10,6 +10,7 @@ Name Nick Email Alec Koumjian akoumjian akoumjian@gmail.com Alex Van't Hof alexvh Angelo Gründler plueschopath angelo.gruendler@w1r3.net +Ari Aosved devaos ari.aosved@gmail.com Boris Feld Lothiraldan bruce-one bruce-one C. R. Oldham cro cr@saltstack.com From cfce026142829240fbddb130fce1da4020856576 Mon Sep 17 00:00:00 2001 From: Ronald van Zantvoort Date: Fri, 6 Feb 2015 14:47:10 +0100 Subject: [PATCH 10/22] Install Apache LibCloud using 'pip' rather than 'pip-python' It doesn't exist on CentOS/RHEL 7, and on 6, it's a symlink to pip anyway, which exists on both. --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 567967f..7190925 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2591,7 +2591,7 @@ install_centos_stable_deps() { if [ "$DISTRO_MAJOR_VERSION" -eq 5 ]; then easy_install-2.6 "apache-libcloud>=$_LIBCLOUD_MIN_VERSION" else - pip-python install "apache-libcloud>=$_LIBCLOUD_MIN_VERSION" + pip install "apache-libcloud>=$_LIBCLOUD_MIN_VERSION" fi fi From 1a4ebc849835bcf14ece36a745acabcee0ed9eee Mon Sep 17 00:00:00 2001 From: Ronald van Zantvoort Date: Fri, 6 Feb 2015 15:00:52 +0100 Subject: [PATCH 11/22] In EPEL 6/7, salt-syndic is separated out of the salt-master package. Bootstrap will fail on it because systemctl subsequently fails to check the service (because it isn't installed) --- bootstrap-salt.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 7190925..44ee81a 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2617,9 +2617,13 @@ install_centos_stable() { if [ "$_INSTALL_MINION" -eq $BS_TRUE ]; then __PACKAGES="${__PACKAGES} salt-minion" fi - if [ "$_INSTALL_MASTER" -eq $BS_TRUE ] || [ "$_INSTALL_SYNDIC" -eq $BS_TRUE ]; then + if [ "$_INSTALL_MASTER" -eq $BS_TRUE ];then __PACKAGES="${__PACKAGES} salt-master" + fi + if [ "$_INSTALL_SYNDIC" -eq $BS_TRUE ];then + __PACKAGES="${__PACKAGES} salt-syndic" fi + if [ "$DISTRO_NAME_L" = "oracle_linux" ]; then # We need to install one package at a time because --enablerepo=X disables ALL OTHER REPOS!!!! for package in ${__PACKAGES}; do From 3c6bbe3a6ba4847f0d9668ee046a0b1b9af506e0 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 7 Feb 2015 01:21:22 +0000 Subject: [PATCH 12/22] Update changes log --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index d7fb872..77f533f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ Version 2015.xx.xx: Zantvoort(The-Loeki) * No need to install packages from the Unstable repository for debian, use backports. Thanks Ari Aosved(devaos) + * Fix an issue in CentOS where the syndic package wasn't being installed(since it's now a + separate package). Thanks Ronald van Zantvoort(The-Loeki) Version 2015.01.12: * Add package upgrades support to FreeBSD. Thanks William Eshagh(eshagl). From ca328e224cd082b9e528afa7d375621f0bd72181 Mon Sep 17 00:00:00 2001 From: Fred Reimer Date: Sat, 14 Feb 2015 18:59:02 -0500 Subject: [PATCH 13/22] Enabled server-optional package for RHEL 7 --- bootstrap-salt.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index bd20267..54ac9de 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2869,6 +2869,9 @@ __test_rhel_optionals_packages() { # shellcheck disable=SC2043 for package in python-jinja2; do echoinfo " - ${package}" + if [ "$DISTRO_MAJOR_VERSION" -ge 6 ]; then + yum-config-manager --enable \*server-optional + fi if [ "$DISTRO_NAME_L" = "oracle_linux" ]; then yum --config "${__YUM_CONF_FILE}" install -y ${package} >/dev/null 2>&1 || \ yum --config "${__YUM_CONF_FILE}" install -y ${package} --enablerepo=${_EPEL_REPO} >/dev/null 2>&1 From bd92249715f65ffdb6ceacc3ed67816a62fec7db Mon Sep 17 00:00:00 2001 From: Fred Reimer Date: Sat, 14 Feb 2015 19:08:28 -0500 Subject: [PATCH 14/22] fixed RHEL version --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 54ac9de..8dbba1e 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2869,7 +2869,7 @@ __test_rhel_optionals_packages() { # shellcheck disable=SC2043 for package in python-jinja2; do echoinfo " - ${package}" - if [ "$DISTRO_MAJOR_VERSION" -ge 6 ]; then + if [ "$DISTRO_MAJOR_VERSION" -ge 7 ]; then yum-config-manager --enable \*server-optional fi if [ "$DISTRO_NAME_L" = "oracle_linux" ]; then From 77a14675861cc8307d0d89df981466b336d3be21 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 16 Feb 2015 01:55:00 +0000 Subject: [PATCH 15/22] Move the `yum-config-manager` call outside the packages loop --- bootstrap-salt.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 22c2d35..6683453 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2838,6 +2838,10 @@ install_centos_check_services() { __test_rhel_optionals_packages() { __install_epel_repository || return 1 + if [ "$DISTRO_MAJOR_VERSION" -ge 7 ]; then + yum-config-manager --enable \*server-optional || return 1 + fi + if [ "$DISTRO_MAJOR_VERSION" -ge 6 ]; then # Let's enable package installation testing, kind of, --dry-run echoinfo "Testing if packages usually on the optionals repository are available:" @@ -2850,9 +2854,6 @@ __test_rhel_optionals_packages() { # shellcheck disable=SC2043 for package in python-jinja2; do echoinfo " - ${package}" - if [ "$DISTRO_MAJOR_VERSION" -ge 7 ]; then - yum-config-manager --enable \*server-optional - fi if [ "$DISTRO_NAME_L" = "oracle_linux" ]; then yum --config "${__YUM_CONF_FILE}" install -y ${package} >/dev/null 2>&1 || \ yum --config "${__YUM_CONF_FILE}" install -y ${package} --enablerepo=${_EPEL_REPO} >/dev/null 2>&1 From f8fdb2d6074257e8097c0dff2fb6c82911c02903 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 16 Feb 2015 01:56:33 +0000 Subject: [PATCH 16/22] Add Fred Reimer(@freimer) to AUTHORS --- AUTHORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index 7639f69..84fab10 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -23,6 +23,7 @@ Diego Woitasen diegows diego.woitasen@vhgroup.net Elias Probst eliasp Erik Johnson terminalmage erik@saltstack.com Forrest Alvarez gravyboat +Fred Reimer freimer freimer@freimer.org Geoff Garside geoffgarside geoff@geoffgarside.co.uk ggillies ggillies Giuseppe Iannello giannello giuseppe.iannello@brokenloop.net From 948c5687df1474184c9ba1085ef4fe07ef863e10 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 16 Feb 2015 01:57:37 +0000 Subject: [PATCH 17/22] Update changes log --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 77f533f..145a84c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Version 2015.xx.xx: Ari Aosved(devaos) * Fix an issue in CentOS where the syndic package wasn't being installed(since it's now a separate package). Thanks Ronald van Zantvoort(The-Loeki) + * Enable the server-optionals repository for RHEL >= 7 Version 2015.01.12: * Add package upgrades support to FreeBSD. Thanks William Eshagh(eshagl). From 58868f7816a2ce8845d7dcb55106b1e14c8b0339 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 27 Feb 2015 00:45:32 +0000 Subject: [PATCH 18/22] Disable the quote warning --- bootstrap-salt.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 6683453..9c73bb9 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2117,6 +2117,7 @@ install_debian_7_deps() { if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then check_pip_allowed "You need to allow pip based installations (-P) in order to install apache-libcloud" __PACKAGES="build-essential python-dev python-pip" + # shellcheck disable=SC2086 __apt_get_install_noinput ${__PACKAGES} || return 1 pip install -U "apache-libcloud>=$_LIBCLOUD_MIN_VERSION" fi From 6ddb240b237befcddb5043ff64fd1d7980e9d6c3 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 27 Feb 2015 01:07:10 +0000 Subject: [PATCH 19/22] RHEL/CentOS 5 now uses the COPR repository. Fixes #533 Refs saltstack/salt#21027 --- bootstrap-salt.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 9c73bb9..00452bf 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2546,11 +2546,22 @@ __install_saltstack_copr_zeromq_repository() { return 0 } +__install_saltstack_copr_salt_el5_repository() { + if [ ! -s /etc/yum.repos.d/saltstack-salt-el5-epel-5.repo ]; then + __fetch_url /etc/yum.repos.d/saltstack-salt-el5-epel-5.repo \ + "http://copr.fedoraproject.org/coprs/saltstack/salt-el5/repo/epel-5/saltstack-salt-el5-epel-5.repo" || return 1 + fi + return 0 +} install_centos_stable_deps() { - __install_epel_repository || return 1 + if [ "$DISTRO_MAJOR_VERSION" -eq 5 ]; then + __install_saltstack_copr_salt_el5_repository || return 1 + else + __install_epel_repository || return 1 + fi - if [ "$_ENABLE_EXTERNAL_ZMQ_REPOS" -eq $BS_TRUE ]; then + if [ "$_ENABLE_EXTERNAL_ZMQ_REPOS" -eq $BS_TRUE ] && [ "$DISTRO_MAJOR_VERSION" -gt 5 ]; then yum -y install python-hashlib || return 1 __install_saltstack_copr_zeromq_repository || return 1 fi From 143380f8653f5a0a31936ad6b0e9d4e61fd24a5c Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 27 Feb 2015 01:10:54 +0000 Subject: [PATCH 20/22] Update changes log --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 145a84c..8122497 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ Version 2015.xx.xx: * Fix an issue in CentOS where the syndic package wasn't being installed(since it's now a separate package). Thanks Ronald van Zantvoort(The-Loeki) * Enable the server-optionals repository for RHEL >= 7 + * RHEL/CentOS 5 now uses the COPR repository. #533 Version 2015.01.12: * Add package upgrades support to FreeBSD. Thanks William Eshagh(eshagl). From fab66964e9edf2625bd8b631380dcc413c659f80 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 27 Feb 2015 01:33:10 +0000 Subject: [PATCH 21/22] We still need EPEL --- bootstrap-salt.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 00452bf..dbb85aa 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2555,10 +2555,9 @@ __install_saltstack_copr_salt_el5_repository() { } install_centos_stable_deps() { + __install_epel_repository || return 1 if [ "$DISTRO_MAJOR_VERSION" -eq 5 ]; then __install_saltstack_copr_salt_el5_repository || return 1 - else - __install_epel_repository || return 1 fi if [ "$_ENABLE_EXTERNAL_ZMQ_REPOS" -eq $BS_TRUE ] && [ "$DISTRO_MAJOR_VERSION" -gt 5 ]; then From a518e5633542200868bed6c765f3e8106dcd0646 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 27 Feb 2015 01:35:40 +0000 Subject: [PATCH 22/22] Bump version for stable release --- ChangeLog | 2 +- bootstrap-salt.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8122497..8dac9a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Version 2015.xx.xx: +Version 2015.02.15: * Try other tools besides wget when downloading the COPR repo file. Thanks Ronald van Zantvoort(The-Loeki) * No need to install packages from the Unstable repository for debian, use backports. Thanks diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index dbb85aa..8f839d5 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -17,7 +17,7 @@ # CREATED: 10/15/2012 09:49:37 PM WEST #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2015.01.12" +__ScriptVersion="2015.02.15" __ScriptName="bootstrap-salt.sh" #======================================================================================================================