Commit graph

2058 commits

Author SHA1 Message Date
Pedro Algarvio
9e651004f9 Merge pull request #732 from jfindlay/overwrite
Merge #541
2016-01-13 22:29:11 +00:00
Justin Findlay
52a6bd2b54 warn user about overwrite when -C is used 2016-01-13 15:08:41 -07:00
Marcus Furlong
b8a5a0a12e Don't add zypp repo if it already exists
closes #730
2016-01-13 14:32:37 +11:00
Justin Findlay
cec5b5a7ac Merge pull request #692 from hipikat/bootstrap-sleep
Process -s (default sleep for service restarts) in bootstrap-salt.sh
2016-01-08 15:39:11 -07:00
Pedro Algarvio
1e693320b7 Merge pull request #726 from jtand/debian_pyzmq
Sometimes bootstrap doesn't install zmq
2016-01-07 22:54:29 +00:00
justinta89
1f69dd0a96 Changed from using python to dpkg-query 2016-01-07 15:51:25 -07:00
justinta89
0d9827b842 Added parentheses on print 2016-01-07 15:06:48 -07:00
justinta89
5d94fc33d3 Sometimes bootstrap doesn't install zmq
When installing from git, bootstrap seems to skip over the zmq installation.
This checks if zmq has been installed, if not, it installs it.
2016-01-07 14:58:38 -07:00
Justin Findlay
6e8229a95c Merge pull request #725 from aboe76/tumbleweed_support
Add opensuse_Tumbleweed support
2016-01-07 11:58:45 -07:00
Niels Abspoel
d699b221d9 improve openSUSE major version code 2016-01-06 20:46:27 +01:00
Justin Findlay
3132db0a8b Merge pull request #721 from vutny/develop
Remove SaltStack COPR repository configuration for CentOS/RHEL5
2016-01-06 10:59:47 -07:00
Justin Findlay
ccdd0059e6 Merge pull request #720 from vutny/cleanup-rhel-optionals-repo
Remove RHEL optional repo check and enable
2016-01-06 10:54:06 -07:00
Sergey Paramonov
2025bc874b fix for FreeBSD 11 installation functions 2015-12-31 12:47:07 -05:00
Sergey Paramonov
f3d2385358 adding support for OpenBSD 2015-12-30 00:13:11 -05:00
Justin Findlay
a69a89ac5f Merge pull request #705 from abednarik/update_setup_options_ubuntu
Removed deprecated cli option.
2015-12-25 12:39:54 -07:00
abednarik
49d1df8a1b Removed deprecated cli option.
Is no longer needed to have this 2 options to bookstrap salt, since now --salt-config-dir is a global option.

Fixes #704
2015-12-25 10:52:43 -03:00
Denys Havrysh
b07dd322ab Remove SaltStack COPR repository configuration for CentOS/RHEL5 2015-12-25 15:06:43 +02:00
Denys Havrysh
5d327c1325 Remove RHEL optional repo check and enable
All necessary packages will be installed from salt repo
2015-12-24 14:32:29 +02:00
Justin Findlay
cb203d5251 Merge pull request #719 from vutny/fix-epel-release-rhel5
Fix `epel-release` package installation on CentOS/RHEL 5
2015-12-23 11:44:07 -07:00
Denys Havrysh
3f09d6b4d9 Make sure curl is available on minimal CentOS 5 images before installing epel-release package 2015-12-23 17:57:54 +02:00
Denys Havrysh
d3ac593a08 Fix EPEL release package installation on CentOS/RHEL 5 2015-12-23 17:56:58 +02:00
Denys Havrysh
4d4de1ec74 Make curl follow HTTP 3XX redirections (wget like behaviour) 2015-12-23 17:21:51 +02:00
Justin Findlay
ee8cab1c1f Merge pull request #718 from vutny/fix-git-without-man
Fix git invocation fail when `man` command is not available
2015-12-22 11:57:30 -07:00
Justin Findlay
71b0b85056 Merge pull request #717 from vutny/fix-epel-repo-detection
Better EPEL repository detection on RHEL and CentOS
2015-12-22 10:43:02 -07:00
Denys Havrysh
79789642a9 Fix git invocation fail when man command is not available 2015-12-22 18:05:28 +02:00
Denys Havrysh
b34efe5633 Fix EPEL repository enabled check
* use global variable
* handle output from YUM command with repo expiry mark
* suppress grep output instead of redirection
2015-12-22 10:07:12 +02:00
Denys Havrysh
6517e03b78 Better EPEL repository detection on RHEL and CentOS 2015-12-21 18:19:37 +02:00
Justin Findlay
009d7c7728 Merge pull request #711 from brandon099/develop
Update SaltStack repo location and latest version for Windows
2015-12-17 12:12:09 -07:00
Brandon Clifford
05f344c596 Update SaltStack repo location and latest version 2015-12-17 11:34:38 -07:00
Justin Findlay
2415bfa1ae Merge pull request #702 from wolfpackmars2/patch-1
Remove redundant lines
2015-12-08 15:43:51 -07:00
Steve Groesz
573091b4cd Remove redundant lines
The referenced package was included in a previous line.  This is merely a cleanup change to prevent future problems and increase maintainability of the code.
2015-12-07 03:59:32 -06:00
Pedro Algarvio
7671ae5631 Add Steve Groesz(@wolfpackmars2) to AUTHORS 2015-12-04 11:43:54 +00:00
Pedro Algarvio
592e75a27f Update changes log 2015-12-04 11:43:13 +00:00
Pedro Algarvio
598d48595a Merge pull request #699 from wolfpackmars2/patch-1
Update bootstrap-salt.sh
2015-12-04 11:41:12 +00:00
Steve Groesz
9347fbd2f8 Update bootstrap-salt.sh
Some cleanup for Debian Deps, especially for Debian 8 where some Dep packages may not have been installed
2015-12-03 23:59:12 -06:00
Pedro Algarvio
27b8611e58 Double quote to prevent globing and word spliting 2015-11-19 12:00:15 +00:00
Pedro Algarvio
b7c02614d7 Merge pull request #693 from rominf/opensuse_42.1
support openSUSE Leap 42.1
2015-11-19 11:29:58 +00:00
Roman Inflianskas
7f834d5626 support openSUSE Leap 42.1 2015-11-19 14:02:17 +03:00
Adam Wright
efede7d75b Process -s (default sleep for service restarts) in bootstrap-salt.sh
An -s option for the 'default sleep' time in bootstrap-salt.sh is
documented in the usage instructions, but not implemented. This commit
lets bootstrap-salt.sh recognise and use the -s option.
2015-11-18 14:32:04 +08:00
Pedro Algarvio
9a161c87bf Make sure wget is installed 2015-11-09 16:22:34 +00:00
Ronald van Zantvoort
440d121534 Ubuntu should use HTTPS for key retrieval; pkgs apparently can't be done 2015-11-06 18:26:40 +01:00
Ronald van Zantvoort
791866c298 Ubuntu should use HTTPS for key & pkg retrieval as well 2015-11-06 18:23:04 +01:00
Ronald van Zantvoort
bc089167b4 CentOS/RHEL 6 don't test for '^[' to determine whether to us glob matching; widen glob somewhat to fix 2015-11-06 15:47:55 +01:00
Ronald van Zantvoort
8c65b7439a fix for git installs not having STABLE_REV 2015-11-05 13:37:22 +01:00
Ronald van Zantvoort
5c0c89f8b3 Add support for pegged versions on YUM based OS'ses through repo.saltstack.com 2015-11-04 18:52:57 +01:00
Pedro Algarvio
35f39898a9 Bump version for stable release 2015-11-04 12:29:31 +00:00
Pedro Algarvio
a1f72e741f Merge pull request #680 from s0undt3ch/develop
Lint fixes
2015-10-28 15:39:59 +00:00
Pedro Algarvio
54a389f15c Lint fixes 2015-10-28 15:39:12 +00:00
Justin Findlay
71fea04eaf Merge pull request #678 from jfindlay/notes
Add Michele Bologna (@mbologna) to AUTHORS
2015-10-27 20:02:23 -06:00
Justin Findlay
ba4d370ca8 Add Michele Bologna (@mbologna) to AUTHORS 2015-10-27 20:01:40 -06:00