From 31b07042f448650ae7e9ea46c9d35d9f193251e7 Mon Sep 17 00:00:00 2001 From: HowardMei Date: Thu, 16 Oct 2014 14:45:50 +0800 Subject: [PATCH 01/20] develop: improve __git_clone_and_checkout to support saltrepo srcurl with non-salt basename --- bootstrap-salt.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 5d594ec73..51122345d 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1124,7 +1124,10 @@ __git_clone_and_checkout() { echodebug "Installed git version: $(git --version | awk '{ print $3 }')" - __SALT_GIT_CHECKOUT_PARENT_DIR=$(dirname "${__SALT_GIT_CHECKOUT_DIR}") + local __SALT_GIT_CHECKOUT_PARENT_DIR=$(dirname "${__SALT_GIT_CHECKOUT_DIR}" 2>/dev/null) + __SALT_GIT_CHECKOUT_PARENT_DIR="${__SALT_GIT_CHECKOUT_PARENT_DIR:-/tmp/git}" + local __SALT_CHECKOUT_REPONAME="$(basename "${__SALT_GIT_CHECKOUT_DIR}" 2>/dev/null)" + __SALT_CHECKOUT_REPONAME="${__SALT_CHECKOUT_REPONAME:-salt}" [ -d "${__SALT_GIT_CHECKOUT_PARENT_DIR}" ] || mkdir "${__SALT_GIT_CHECKOUT_PARENT_DIR}" cd "${__SALT_GIT_CHECKOUT_PARENT_DIR}" if [ -d "${__SALT_GIT_CHECKOUT_DIR}" ]; then @@ -1170,7 +1173,7 @@ __git_clone_and_checkout() { if [ "$(git clone --help | grep 'single-branch')" != "" ]; then # The "--single-branch" option is supported, attempt shallow cloning echoinfo "Attempting to shallow clone $GIT_REV from Salt's repository ${_SALT_REPO_URL}" - git clone --depth 1 --branch "$GIT_REV" "$_SALT_REPO_URL" + git clone --depth 1 --branch "$GIT_REV" "$_SALT_REPO_URL" "$__SALT_CHECKOUT_REPONAME" if [ $? -eq 0 ]; then cd "${__SALT_GIT_CHECKOUT_DIR}" __SHALLOW_CLONE="${BS_TRUE}" @@ -1178,17 +1181,17 @@ __git_clone_and_checkout() { # Shallow clone above failed(missing upstream tags???), let's resume the old behaviour. echowarn "Failed to shallow clone." echoinfo "Resuming regular git clone and remote SaltStack repository addition procedure" - git clone "$_SALT_REPO_URL" || return 1 + git clone "$_SALT_REPO_URL" "$__SALT_CHECKOUT_REPONAME" || return 1 cd "${__SALT_GIT_CHECKOUT_DIR}" fi else echodebug "Shallow cloning not possible. Required git version not met." - git clone "$_SALT_REPO_URL" || return 1 + git clone "$_SALT_REPO_URL" "$__SALT_CHECKOUT_REPONAME" || return 1 cd "${__SALT_GIT_CHECKOUT_DIR}" fi else echowarn "The git revision being installed does not match a Salt version tag. Shallow cloning disabled" - git clone "$_SALT_REPO_URL" || return 1 + git clone "$_SALT_REPO_URL" "$__SALT_CHECKOUT_REPONAME" || return 1 cd "${__SALT_GIT_CHECKOUT_DIR}" fi From d73a0ecb56163d389eb66660228dbf9ed26b2912 Mon Sep 17 00:00:00 2001 From: Pavel Snagovsky Date: Thu, 16 Oct 2014 18:50:50 -0700 Subject: [PATCH 02/20] fixing path to python bnary on FreeBSD symlink /usr/local/bin/python is not created by current package use /usr/local/bin/python2 --- bootstrap-salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 5d594ec73..1647ba2a2 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -3656,9 +3656,9 @@ install_freebsd_git() { # Install from git if [ ! -f salt/syspaths.py ]; then # We still can't provide the system paths, salt 0.16.x - /usr/local/bin/python setup.py install || return 1 + /usr/local/bin/python2 setup.py install || return 1 else - /usr/local/bin/python setup.py install \ + /usr/local/bin/python2 setup.py install \ --salt-root-dir=/usr/local \ --salt-config-dir="${_SALT_ETC_DIR}" \ --salt-cache-dir=/var/cache/salt \ From 0b910ee8f65dd45a89bc0f30f3c5928697968a23 Mon Sep 17 00:00:00 2001 From: Mark Gaylard Date: Fri, 17 Oct 2014 15:36:28 +1100 Subject: [PATCH 03/20] Fix syndic installation on centos/amazon linux when installing salt from git version --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 5d594ec73..b12db2907 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2674,7 +2674,7 @@ install_centos_git() { } install_centos_git_post() { - for fname in minion master minion api; do + for fname in minion master syndic api; do # Skip if not meant to be installed [ $fname = "minion" ] && [ "$_INSTALL_MINION" -eq $BS_FALSE ] && continue From c42b21d2f7928c585b2579544faf8b8b65e310f3 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 14 Oct 2014 05:42:05 +0100 Subject: [PATCH 04/20] 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 bcc8a4771..4e58f37ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Version 2014.xx.xx: +Version 2014.10.14: * Fixed a regex issue with matching Salt's tags. Match v2014.7 but not 2014.7 as a valid tag * Distro Support Added: * Added Linux Mint 17 support(Thanks Skyler Berg) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 251467575..9bd1562d5 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="2014.09.24" +__ScriptVersion="2014.10.14" __ScriptName="bootstrap-salt.sh" #====================================================================================================================== From 010c8874aa9b0e5cc4e9cd6f3822492b1e631439 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 17 Oct 2014 20:32:39 +0100 Subject: [PATCH 05/20] Update changes log --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4e58f37ae..02cf0319d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +Version 2014.xx.xx: + * Fix path to python on FreeBSD. Thanks Pavel Snagovsky(paha) + Version 2014.10.14: * Fixed a regex issue with matching Salt's tags. Match v2014.7 but not 2014.7 as a valid tag * Distro Support Added: From 2563d1fb21c3c16f38970fee60be4509eec6293d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 17 Oct 2014 20:33:26 +0100 Subject: [PATCH 06/20] Add Pavel Snagovsky(@paha) to AUTHORS --- AUTHORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index 06cf6cf79..a8200b153 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -41,6 +41,7 @@ Mike Carlson m87carlson mike@bayphoto.com nevins-b nevins-b Niels Abspoel aboe76 Paul Brian lifeisstillgood paul@mikadosoftware.com +Pavel Snagovsky paha Pedro Algarvio s0undt3ch pedro@algarvio.me Pedro Paulo pedropaulovc Raymond Barbiero visualphoenix From 9a5294a4f0ae4a3ec67b407fb24cdff7e0f49430 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 17 Oct 2014 20:37:05 +0100 Subject: [PATCH 07/20] Update changes log --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 02cf0319d..baf85d99f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ Version 2014.xx.xx: * Fix path to python on FreeBSD. Thanks Pavel Snagovsky(paha) + * Fix syndic installation on RHEL based installations. Thanks markgaylard Version 2014.10.14: * Fixed a regex issue with matching Salt's tags. Match v2014.7 but not 2014.7 as a valid tag From bcb2c5194e79b8ad9c54fd90cc59b62f45295047 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 17 Oct 2014 20:37:40 +0100 Subject: [PATCH 08/20] Add @markgaylard to AUTHORS --- AUTHORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index a8200b153..d7a898c23 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -33,6 +33,7 @@ Juan A. Moyano wincus wincus.public@gmail.com Karl Grzeszczak karlgrz Kenneth Wilke KennethWilke Liu Xiaohui oreh herolxh@gmail.com +markgaylard markgaylard Matthew Garrett cingeyedog matt@clemson.edu Matthew Mead-Briggs mattmb Matthew Willson ixela From d0fe492d73aa44c2330a819fb402348b75177df0 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 17 Oct 2014 23:42:57 +0100 Subject: [PATCH 09/20] Update changes log --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index baf85d99f..4bbab4c10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ Version 2014.xx.xx: * Fix path to python on FreeBSD. Thanks Pavel Snagovsky(paha) * Fix syndic installation on RHEL based installations. Thanks markgaylard + * Properly detect the git checkout `basename` directory instead of hard coding it. Thanks + Howard Mei(HowardMei). Version 2014.10.14: * Fixed a regex issue with matching Salt's tags. Match v2014.7 but not 2014.7 as a valid tag From cf6bb803dfad44d6ddd037f07348bae86d140a40 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 17 Oct 2014 23:43:43 +0100 Subject: [PATCH 10/20] Add Howard Mei(@HowardMei) to AUTHORS --- AUTHORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index d7a898c23..5da45fd3b 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -27,6 +27,7 @@ Gregory Meno GregMeno gregory.meno@inktank.com Guillaume Derval GuillaumeDerval guillaume@guillaumederval.be gweis gweis Henrik Holmboe holmboe +Howard Mei HowardMei howardleomei@gmail.com Jeff Hui jeffh jeff@jeffhui.net Jeff Strunk jstrunk Juan A. Moyano wincus wincus.public@gmail.com From 7bdd1e224a51a6bed3ee8e6f6c3708518c5d950e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 20 Oct 2014 20:44:16 +0100 Subject: [PATCH 11/20] Allow installing ZMQ for SaltStack's COPR repository --- bootstrap-salt.sh | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index ce0b14d8e..0c3444df6 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -202,6 +202,7 @@ _INSECURE_DL=${BS_INSECURE_DL:-$BS_FALSE} _WGET_ARGS=${BS_WGET_ARGS:-} _CURL_ARGS=${BS_CURL_ARGS:-} _FETCH_ARGS=${BS_FETCH_ARGS:-} +_ENABLE_EXTERNAL_ZMQ_REPOS=${BS_ENABLE_EXTERNAL_ZMQ_REPOS:-$BS_FALSE} _SALT_MASTER_ADDRESS=${BS_SALT_MASTER_ADDRESS:-null} _SALT_MINION_ID="null" # __SIMPLIFY_VERSION is mostly used in Solaris based distributions @@ -271,12 +272,13 @@ usage() { -p Extra-package to install while installing salt dependencies. One package per -p flag. You're responsible for providing the proper package name. -H Use the specified http proxy for the installation + -Z Enable external software source for newer ZeroMQ(Only available for RHEL/CentOS/Fedora based distributions) EOT } # ---------- end of function usage ---------- -while getopts ":hvnDc:g:k:MSNXCPFUKIA:i:Lp:H:" opt +while getopts ":hvnDc:g:k:MSNXCPFUKIA:i:Lp:H:Z" opt do case "${opt}" in @@ -319,6 +321,7 @@ do L ) _INSTALL_CLOUD=$BS_TRUE ;; p ) _EXTRA_PACKAGES="$_EXTRA_PACKAGES $OPTARG" ;; H ) _HTTP_PROXY="$OPTARG" ;; + Z) _ENABLE_EXTERNAL_ZMQ_REPOS=$BS_TRUE ;; \?) echo @@ -2363,6 +2366,10 @@ install_debian_check_services() { # Fedora Install Functions # install_fedora_deps() { + if [ "$_ENABLE_EXTERNAL_ZMQ_REPOS" -eq $BS_TRUE ]; then + __install_saltstack_copr_zeromq_repository || return 1 + fi + __PACKAGES="yum-utils PyYAML libyaml m2crypto python-crypto python-jinja2 python-msgpack python-zmq python-requests" if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then @@ -2534,9 +2541,32 @@ __install_epel_repository() { return 0 } +__install_saltstack_copr_zeromq_repository() { + if [ ! /etc/yum.repos.d/saltstack-zeromq4.repo ]; then + if [ "$CPU_ARCH_L" = "i686" ]; then + __COPR_ARCH="i386" + else + __COPR_ARCH=$CPU_ARCH_L + fi + if [ "${DISTRO_NAME_L}" = "fedora" ]; then + __REPOTYPE="${DISTRO_NAME_L}" + else + __REPOTYPE="epel" + fi + wget -O /etc/yum.repos.d/saltstack-zeromq4.repo \ + htitp://copr-be.cloud.fedoraproject.org/results/saltstack/zeromq4/${__REPOTYPE}-${DISTRO_MAJOR_VERSION}-${__COPR_ARCH}/ || return 1 + fi + return 0 +} + + install_centos_stable_deps() { __install_epel_repository || return 1 + if [ "$_ENABLE_EXTERNAL_ZMQ_REPOS" -eq $BS_TRUE ]; then + __install_saltstack_copr_zeromq_repository || return 1 + fi + if [ "$_UPGRADE_SYS" -eq $BS_TRUE ]; then yum -y update || return 1 fi From 3c92a8e1a7787f162a0d14e347fa18d8f30fd292 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 20 Oct 2014 20:45:18 +0100 Subject: [PATCH 12/20] Update changes log --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 4bbab4c10..0e29a9dd9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ Version 2014.xx.xx: * Fix syndic installation on RHEL based installations. Thanks markgaylard * Properly detect the git checkout `basename` directory instead of hard coding it. Thanks Howard Mei(HowardMei). + * Allow installing ZMQ for SaltStack's COPR repository. Version 2014.10.14: * Fixed a regex issue with matching Salt's tags. Match v2014.7 but not 2014.7 as a valid tag From 06f50385436a6d416a9e24a27304254e0e02a7a5 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 20 Oct 2014 21:12:23 +0100 Subject: [PATCH 13/20] Fix COPR URL --- bootstrap-salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 0c3444df6..8fbc76266 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2542,7 +2542,7 @@ __install_epel_repository() { } __install_saltstack_copr_zeromq_repository() { - if [ ! /etc/yum.repos.d/saltstack-zeromq4.repo ]; then + if [ ! -f /etc/yum.repos.d/saltstack-zeromq4.repo ]; then if [ "$CPU_ARCH_L" = "i686" ]; then __COPR_ARCH="i386" else @@ -2554,7 +2554,7 @@ __install_saltstack_copr_zeromq_repository() { __REPOTYPE="epel" fi wget -O /etc/yum.repos.d/saltstack-zeromq4.repo \ - htitp://copr-be.cloud.fedoraproject.org/results/saltstack/zeromq4/${__REPOTYPE}-${DISTRO_MAJOR_VERSION}-${__COPR_ARCH}/ || return 1 + https://copr.fedoraproject.org/coprs/saltstack/zeromq4/repo/${__REPOTYPE}-${DISTRO_MAJOR_VERSION}/saltstack-zeromq4-${__REPOTYPE}-${DISTRO_MAJOR_VERSION}.repo || return 1i fi return 0 } From 4f22907ce1d609a16b8d20164c9f8a306f05152f Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 21 Oct 2014 01:24:36 +0100 Subject: [PATCH 14/20] Remove unused code and some lint fixes --- bootstrap-salt.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 8fbc76266..d158813b5 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1546,7 +1546,7 @@ __check_services_debian() { servicename=$1 echodebug "Checking if service ${servicename} is enabled" - # shellcheck disable=SC2086,SC2046 + # shellcheck disable=SC2086,SC2046,SC2144 if [ -f /etc/rc$(runlevel | awk '{ print $2 }').d/S*${servicename} ]; then echodebug "Service ${servicename} is enabled" return 0 @@ -2543,20 +2543,15 @@ __install_epel_repository() { __install_saltstack_copr_zeromq_repository() { if [ ! -f /etc/yum.repos.d/saltstack-zeromq4.repo ]; then - if [ "$CPU_ARCH_L" = "i686" ]; then - __COPR_ARCH="i386" - else - __COPR_ARCH=$CPU_ARCH_L - fi if [ "${DISTRO_NAME_L}" = "fedora" ]; then __REPOTYPE="${DISTRO_NAME_L}" else __REPOTYPE="epel" fi wget -O /etc/yum.repos.d/saltstack-zeromq4.repo \ - https://copr.fedoraproject.org/coprs/saltstack/zeromq4/repo/${__REPOTYPE}-${DISTRO_MAJOR_VERSION}/saltstack-zeromq4-${__REPOTYPE}-${DISTRO_MAJOR_VERSION}.repo || return 1i + "https://copr.fedoraproject.org/coprs/saltstack/zeromq4/repo/${__REPOTYPE}-${DISTRO_MAJOR_VERSION}/saltstack-zeromq4-${__REPOTYPE}-${DISTRO_MAJOR_VERSION}.repo" || return 1i fi - return 0 + return 1 } From 091fff78e74f7dc28679dbce44afa8e5aa7aad5c Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 21 Oct 2014 01:38:14 +0100 Subject: [PATCH 15/20] Remove extra char left over --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index d158813b5..a733d2565 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2549,7 +2549,7 @@ __install_saltstack_copr_zeromq_repository() { __REPOTYPE="epel" fi wget -O /etc/yum.repos.d/saltstack-zeromq4.repo \ - "https://copr.fedoraproject.org/coprs/saltstack/zeromq4/repo/${__REPOTYPE}-${DISTRO_MAJOR_VERSION}/saltstack-zeromq4-${__REPOTYPE}-${DISTRO_MAJOR_VERSION}.repo" || return 1i + "https://copr.fedoraproject.org/coprs/saltstack/zeromq4/repo/${__REPOTYPE}-${DISTRO_MAJOR_VERSION}/saltstack-zeromq4-${__REPOTYPE}-${DISTRO_MAJOR_VERSION}.repo" || return 1 fi return 1 } From bea5cc761cd9daa905df22c4868cb89b6431ef23 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 21 Oct 2014 01:54:50 +0100 Subject: [PATCH 16/20] Allow installing ZMQ4/PyZMQ14 from Chris Lea's PPA repository --- bootstrap-salt.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index a733d2565..9a8c87d82 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1701,6 +1701,10 @@ install_ubuntu_deps() { __apt_get_install_noinput python-apt if [ "$DISTRO_MAJOR_VERSION" -gt 12 ] || ([ "$DISTRO_MAJOR_VERSION" -eq 12 ] && [ "$DISTRO_MINOR_VERSION" -gt 03 ]); then + if [ "$_ENABLE_EXTERNAL_ZMQ_REPOS" -eq $BS_TRUE ]; then + echoinfo "Installing ZMQ>=4/PyZMQ>=14 from Chris Lea's PPA repository" + add-apt-repository -y ppa:chris-lea/zeromq || return 1 + fi __apt_get_install_noinput python-requests __PIP_PACKAGES="" else From 3ef17a7a44d0d4f867acb6881362a532b25fcc37 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 21 Oct 2014 01:57:25 +0100 Subject: [PATCH 17/20] Update changes log --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 0e29a9dd9..73e5ae83a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ Version 2014.xx.xx: * Properly detect the git checkout `basename` directory instead of hard coding it. Thanks Howard Mei(HowardMei). * Allow installing ZMQ for SaltStack's COPR repository. + * Allow installing ZMQ4/PyZMQ14 from Chris Lea's PPA repository. Version 2014.10.14: * Fixed a regex issue with matching Salt's tags. Match v2014.7 but not 2014.7 as a valid tag From 97943030c274abc6338c7ed47a16cd23ca6802e4 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 21 Oct 2014 01:57:28 +0100 Subject: [PATCH 18/20] Echo message about packages being installed from SaltStack's COPR repo --- bootstrap-salt.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 9a8c87d82..80c61b04c 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2546,6 +2546,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 [ "${DISTRO_NAME_L}" = "fedora" ]; then __REPOTYPE="${DISTRO_NAME_L}" From e688367fdb25310732a583193334f8961e151ef3 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 21 Oct 2014 23:01:58 +0100 Subject: [PATCH 19/20] Don't return 1 if it's not an error --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 80c61b04c..c89a13f27 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2556,7 +2556,7 @@ __install_saltstack_copr_zeromq_repository() { wget -O /etc/yum.repos.d/saltstack-zeromq4.repo \ "https://copr.fedoraproject.org/coprs/saltstack/zeromq4/repo/${__REPOTYPE}-${DISTRO_MAJOR_VERSION}/saltstack-zeromq4-${__REPOTYPE}-${DISTRO_MAJOR_VERSION}.repo" || return 1 fi - return 1 + return 0 } From adee42322666654f83ac660a4e4ad61a26883a75 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 21 Oct 2014 23:09:59 +0100 Subject: [PATCH 20/20] 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 73e5ae83a..e9a5e6239 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Version 2014.xx.xx: +Version 2014.10.21: * Fix path to python on FreeBSD. Thanks Pavel Snagovsky(paha) * Fix syndic installation on RHEL based installations. Thanks markgaylard * Properly detect the git checkout `basename` directory instead of hard coding it. Thanks diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index c89a13f27..2d6848c1e 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="2014.10.14" +__ScriptVersion="2014.10.21" __ScriptName="bootstrap-salt.sh" #======================================================================================================================