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

Merge branch 'develop' into stable for v2014.10.28 release

Browse source
This commit is contained in:
Pedro Algarvio 2014-10-28 02:07:23 +00:00
commit 8b29491c01
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Version 2014.10.28:
* Install the python systemd bindings for Arch and Fedora git installations
* Allow cloning from Salt's git repository using HTTPS. #475
Version 2014.10.21: Version 2014.10.21:
* Fix path to python on FreeBSD. Thanks Pavel Snagovsky(paha) * Fix path to python on FreeBSD. Thanks Pavel Snagovsky(paha)
* Fix syndic installation on RHEL based installations. Thanks markgaylard * Fix syndic installation on RHEL based installations. Thanks markgaylard

19
bootstrap-salt.sh
View file

@ -17,8 +17,7 @@
# CREATED: 10/15/2012 09:49:37 PM WEST # CREATED: 10/15/2012 09:49:37 PM WEST
#====================================================================================================================== #======================================================================================================================
set -o nounset # Treat unset variables as an error set -o nounset # Treat unset variables as an error
__ScriptVersion="2014.10.28"
__ScriptVersion="2014.10.21"
__ScriptName="bootstrap-salt.sh" __ScriptName="bootstrap-salt.sh"
#====================================================================================================================== #======================================================================================================================
@ -244,6 +243,7 @@ usage() {
-D Show debug output. -D Show debug output.
-c Temporary configuration directory -c Temporary configuration directory
-g Salt repository URL. (default: git://github.com/saltstack/salt.git) -g Salt repository URL. (default: git://github.com/saltstack/salt.git)
-G Insteady of cloning from git://github.com/saltstack/salt.git, clone from https://github.com/saltstack/salt.git (Usually necessary on systems which have the regular git protocol port blocked, where https usualy is not)
-k Temporary directory holding the minion keys which will pre-seed -k Temporary directory holding the minion keys which will pre-seed
the master. the master.
-s Sleep time used when waiting for daemons to start, restart and when checking -s Sleep time used when waiting for daemons to start, restart and when checking
@ -279,7 +279,7 @@ EOT
} # ---------- end of function usage ---------- } # ---------- end of function usage ----------
while getopts ":hvnDc:g:k:MSNXCPFUKIA:i:Lp:H:Z" opt while getopts ":hvnDc:Gg:k:MSNXCPFUKIA:i:Lp:H:Z" opt
do do
case "${opt}" in case "${opt}" in
@ -300,6 +300,13 @@ do
fi fi
;; ;;
g ) _SALT_REPO_URL=$OPTARG ;; g ) _SALT_REPO_URL=$OPTARG ;;
G ) if [ "${_SALT_REPO_URL}" = "${_SALTSTACK_REPO_URL}" ]; then
_SALTSTACK_REPO_URL="https://github.com/saltstack/salt.git"
_SALT_REPO_URL=${_SALTSTACK_REPO_URL}
else
_SALTSTACK_REPO_URL="https://github.com/saltstack/salt.git"
fi
;;
k ) _TEMP_KEYS_DIR="$OPTARG" k ) _TEMP_KEYS_DIR="$OPTARG"
# If the configuration directory does not exist, error out # If the configuration directory does not exist, error out
if [ ! -d "$_TEMP_KEYS_DIR" ]; then if [ ! -d "$_TEMP_KEYS_DIR" ]; then
@ -1131,7 +1138,7 @@ __git_clone_and_checkout() {
local __SALT_GIT_CHECKOUT_PARENT_DIR=$(dirname "${__SALT_GIT_CHECKOUT_DIR}" 2>/dev/null) 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}" __SALT_GIT_CHECKOUT_PARENT_DIR="${__SALT_GIT_CHECKOUT_PARENT_DIR:-/tmp/git}"
local __SALT_CHECKOUT_REPONAME="$(basename "${__SALT_GIT_CHECKOUT_DIR}" 2>/dev/null)" local __SALT_CHECKOUT_REPONAME="$(basename "${__SALT_GIT_CHECKOUT_DIR}" 2>/dev/null)"
__SALT_CHECKOUT_REPONAME="${__SALT_CHECKOUT_REPONAME:-salt}" __SALT_CHECKOUT_REPONAME="${__SALT_CHECKOUT_REPONAME:-salt}"
[ -d "${__SALT_GIT_CHECKOUT_PARENT_DIR}" ] || mkdir "${__SALT_GIT_CHECKOUT_PARENT_DIR}" [ -d "${__SALT_GIT_CHECKOUT_PARENT_DIR}" ] || mkdir "${__SALT_GIT_CHECKOUT_PARENT_DIR}"
cd "${__SALT_GIT_CHECKOUT_PARENT_DIR}" cd "${__SALT_GIT_CHECKOUT_PARENT_DIR}"
if [ -d "${__SALT_GIT_CHECKOUT_DIR}" ]; then if [ -d "${__SALT_GIT_CHECKOUT_DIR}" ]; then
@ -2430,7 +2437,7 @@ install_fedora_stable_post() {
install_fedora_git_deps() { install_fedora_git_deps() {
install_fedora_deps || return 1 install_fedora_deps || return 1
yum install -y git || return 1 yum install -y git systemd-python || return 1
__git_clone_and_checkout || return 1 __git_clone_and_checkout || return 1
@ -3378,7 +3385,7 @@ install_arch_linux_git_deps() {
pacman -R --noconfirm --needed python2-distribute pacman -R --noconfirm --needed python2-distribute
pacman -Sy --noconfirm --needed git python2-crypto python2-setuptools python2-jinja \ pacman -Sy --noconfirm --needed git python2-crypto python2-setuptools python2-jinja \
python2-m2crypto python2-markupsafe python2-msgpack python2-psutil python2-yaml \ python2-m2crypto python2-markupsafe python2-msgpack python2-psutil python2-yaml \
python2-pyzmq zeromq python2-requests || return 1 python2-pyzmq zeromq python2-requests python2-systemd || return 1
__git_clone_and_checkout || return 1 __git_clone_and_checkout || return 1