Commit graph

2371 commits

Author SHA1 Message Date
Nicole Thomas
fc94494511 Merge pull request #967 from plumbis/patch-1
adds supports for Cumulus Linux
2016-10-07 15:28:15 -06:00
Pete Lumbis
178c862d1f adds supports for Cumulus Linux
this change adds Cumulus Linux 2.x and 3.x as proper Debian derivatives. Cumulus Linux maintains a separate repo that does not contain all of the salt dependencies. The user will still be required to point their system to a global Debian repo for this to execute successfully.
2016-10-04 11:19:30 -04:00
Nicole Thomas
3dd2ab8701 Merge pull request #966 from rallytime/fix-764
Run "pip install -U futures" for SmartOS git install
2016-09-28 07:58:24 -06:00
rallytime
73a6bb9915 Run "pip install -U futures" for SmartOS git install
Fixes #764

When installing salt via git on SmartOS, salt commands would fail
because the required version of python futures wasn't installed.

We need to add a "pip install -U futures" call (triggered by passing
in -P) to the SmartOS git installation like we do for the required
version of tornado.
2016-09-27 14:35:55 -06:00
rallytime
bc06d20a20 Change /pkg/rpm/ to /pkg/deb/ in install_ubuntu_git_post func
Fixes #956
2016-09-27 11:40:53 -06:00
Nicole Thomas
37bb62865c Merge pull request #964 from rallytime/fix-962
SUSE: Refactor systemsmanagement_saltstack repo checks to be DRY
2016-09-27 11:34:01 -06:00
rallytime
e0cffd7855 SUSE: Refactor systemsmanagement_saltstack repo checks to be DRY
Also, relax the search for systemsmanagement_saltstack before
attempting to add and refresh the zypper repo list. When running
the bootstrap script on a Suse machine that already had the repo
present, we were failing the strict check, and then attempting
to add the repo even though it already existed. This would cause
the bootstrap script to exit and you couldn't try to install Salt
at a different version or try to run the script again.

Fixes #962
2016-09-27 11:19:32 -06:00
Nicole Thomas
3fc1501858 Merge pull request #963 from sp1r/fix-epel-repo-with-metadata-detection
Fix detection of EPEL repository with not-expired metadata
2016-09-23 08:27:32 -06:00
Vyacheslav Spiridonov
1f88e3a1b9 Fix detection of EPEL repository with not-expired metadata 2016-09-23 12:20:55 +03:00
Nicole Thomas
b5978ee1cd Merge pull request #958 from vutny/deprecate-G
Display warning message about deprecating the `-G` option
2016-09-19 16:20:03 -06:00
Thomas S Hatch
b9d3139cb7 Merge pull request #950 from rallytime/fix-941
Try to install SP4 packages on SLE 11 when SP version is older
2016-09-19 12:21:58 -06:00
Denys Havrysh
9d8b3bed93 Display warning message about deprecating the -G option 2016-09-13 14:38:21 +03:00
Nicole Thomas
f02a874d0c Merge pull request #955 from jtand/freebsd_fix
Allow correct salt paths to be used when -c is passed
2016-09-12 15:49:10 -06:00
Justin Anderson
a7160623d0 We no longer need a specific config_freebsd_salt function 2016-09-12 15:46:25 -06:00
Justin Anderson
e6e07c63b7 Allow correct salt paths to be used when -c is passed 2016-09-12 12:07:30 -06:00
Nicole Thomas
88d6f10363 Merge pull request #954 from fizmat/develop
Fix issues with replacing configs when python3 is default in os.
2016-09-12 11:53:43 -06:00
Ivan Kadochnikov
7206d73043 Test python for yaml when replacing configs 2016-09-13 03:35:20 +10:00
Ivan Kadochnikov
3388e470b8 Minimize python use when replacing configs 2016-09-13 03:33:27 +10:00
Thomas S Hatch
47d0308b8e Merge pull request #951 from rallytime/remove-m2crypto
Remove m2crypto package installs
2016-09-08 17:11:56 -06:00
rallytime
f6087d7bd2 Remove m2crypto package installs
M2Crypto was removed as a hard dependency in Salt starting with
the 2015.8 releases. We don't need to install this during a bootstrap
run anymore.
2016-09-08 17:08:05 -06:00
rallytime
01597bcfa0 Try to install SP4 packages on SLE 11 when SP version is older
Fixes #941

If we detect an older service pack when installing Salt on SLES,
we should warn the user that we'll attempt to install SP4 Salt
packages, and then attempt to do so.

repo.saltstack.com pegs the SLE 11 repo at SP4, as does SUSE, so
we should attempt to install those instead of failing like this:
```
File '/opensuse/SLE_11_SP3/systemsmanagement:saltstack.repo' not found on medium 'https://repo.saltstack.com/'
```
2016-09-08 15:32:38 -06:00
Nicole Thomas
2135750bb0 Merge pull request #948 from rallytime/fix-917
Add python-futures package to install_centos_git_deps
2016-09-08 15:15:51 -06:00
rallytime
76f4d20dbe Add python-futures package to install_centos_git_deps 2016-09-02 11:28:20 -06:00
Denys Havrysh
ac982819f8 Update .gitignore with more generic pattern for VIM swap files 2016-09-01 17:45:15 +03:00
Nicole Thomas
dec96e8d38 Merge pull request #947 from rallytime/updates-for-876
Add /etc/portage/package.accept_keywords to CONFIG_PROTECT_MASK
2016-08-29 17:04:16 -06:00
rallytime
c978acd0bc Add /etc/portage/package.accept_keywords to CONFIG_PROTECT_MASK
Refs #876
2016-08-29 16:58:53 -06:00
Nicole Thomas
73a83450ec Merge pull request #945 from vutny/github-https-by-default
Deprecate `-G` option: use `https` scheme for GitHub by default
2016-08-29 16:51:33 -06:00
Denys Havrysh
cdef85919f Deprecate -G option: use https scheme for GitHub by default 2016-08-27 23:40:56 +03:00
Denys Havrysh
caadc0931e Debian/Ubuntu: update the local keyring with the archive keyring 2016-08-26 11:26:33 +03:00
Denys Havrysh
f523651668 On Debian and Ubuntu allow to obtain GnuPG archive keys insecurely 2016-08-19 13:16:50 +03:00
Denys Havrysh
0e45ba1c72 Use apt-key to retrieve GPG pubic keys on Debian and Ubuntu 2016-08-19 11:22:46 +03:00
Nicole Thomas
250fd33fc8 Merge pull request #931 from vutny/salt-api-service
Configure `salt-api` service, but do not attempt to start it on all OS
2016-08-18 13:48:39 -06:00
Pedro Algarvio
d2561bd606 Merge pull request #932 from vutny/rhel-detection-workaround
Add workaround when `__camelcase_split` doesn't work. Fixes #918
2016-08-18 15:14:33 -04:00
Denys Havrysh
171e9e0d11 Fix locale issues: use POSIX character classes instead of ranges 2016-08-17 10:28:48 +03:00
Nicole Thomas
33961ffd31 Merge pull request #937 from rallytime/hotfix-release
Update Changelog and Bump Version Number for Release
2016-08-16 10:41:56 -06:00
rallytime
a240a9b1a8 Update Changelog and Bump Version Number for Release 2016-08-16 10:39:09 -06:00
Nicole Thomas
4cd02d40af Merge pull request #936 from vutny/fix-ubuntu-git-pip
Ubuntu git mode: install all deps from SaltStack corp repo by default
2016-08-16 10:11:20 -06:00
Denys Havrysh
abc5ee9952 Ubuntu git mode: install all deps from SaltStack corp repo by default 2016-08-16 18:55:32 +03:00
Nicole Thomas
e9328eddd0 Merge pull request #933 from rallytime/changelog-updates
Changelog updates and release version number change
2016-08-15 13:04:07 -06:00
rallytime
5ffa2d0430 Update stable version number to 2016.08.15 2016-08-15 12:58:57 -06:00
rallytime
96efc3aec5 Update changelog with recent PRs 2016-08-15 12:56:27 -06:00
Denys Havrysh
f081b05a97 Add workaround when __camelcase_split doesn't work. Fixes #918 2016-08-15 16:46:18 +03:00
Denys Havrysh
f0b2b5cc38 Configure salt-api service, but do not attempt to start it on all OS 2016-08-14 23:11:38 +03:00
Pedro Algarvio
4f487b8eff Merge pull request #929 from rallytime/fix-926
Remove chris-lea python-zmq repo
2016-08-12 14:20:22 -04:00
rallytime
e0c5b42083 Remove chris-lea python-zmq repo
python-zmq is provided by repo.saltstack.com now, for platforms
that do not have a recent enough version.

Fixes #926
2016-08-12 12:15:50 -06:00
Pedro Algarvio
4b52e90541 Merge pull request #928 from rallytime/fix-924
Disable the '--enablerepo=${_EPEL_REPO}' part of yum install cmds when passing -R/-r
2016-08-12 12:29:04 -04:00
rallytime
3da25985cd Disable the '--enablerepo=${_EPEL_REPO}' part of yum install cmds when passing -R/-r
Fixes #924
2016-08-12 10:10:48 -06:00
Nicole Thomas
38cf2e0892 Merge pull request #927 from vutny/fix-check-services-sysvinit
Fix grep pattern in `__check_services_sysvinit`
2016-08-12 08:43:24 -06:00
Denys Havrysh
17560c2c42 Fix grep pattern in __check_services_sysvinit 2016-08-12 13:08:04 +03:00
Nicole Thomas
c6f754eebd Merge pull request #925 from toanju/fix-missing-dep-fedora
missing python dependency for salt-cloud added
2016-08-11 13:17:18 -06:00