Commit Graph

34554 Commits

Author SHA1 Message Date
Daniel Wallace
37470d81b4 closes #14558 2014-07-28 18:36:55 -05:00
Daniel Wallace
bbf0082017 closes #14556 2014-07-28 18:36:30 -05:00
Daniel Wallace
0a635d9ecd closes #14565 2014-07-28 18:34:54 -05:00
Daniel Wallace
baf74a5d7b closes #14564 2014-07-28 18:30:46 -05:00
Daniel Wallace
fdde21a1fb closes #14566 2014-07-28 18:30:41 -05:00
Pedro Algarvio
48b5a31703 Update to latest, v2014.07.27 bootstrap script.
* Amazon Linux AMI 2010.xx is now explicitly not supported.
* Install the `salt-api` scripts if available when the `salt-master` is also installed.
* Added support for a configurable sleep time when starting, restarting and checking
  for enabled services.
* Drop the `tsflags` requirement for RHEL and RHEL based distributions.
* When sorting release files, oracle-release has higher priority than redhat-release.
* Distro Support Fixed:
  * Debian >= 7 uses system's python-requests package, not PIP
  * Install 'python-zypp' in SuSE and openSUSE(required by Salt's zypper module)
  * Only install EPEL on requiring distributions if not already installed
  * CentOS 7 now uses systemd and the script now properly handles it
  * systemd in openSUSE 12.2 complains if service does not contain `.service``
  * Properly detect openSUSE using `lsb_release
  * SLES 11 SP3 ships with both python-M2Crypto-0.22.* and python-m2crypto-0.21 and we
    will be asked which we want to install, even with --non-interactive. Let's try to
    install the higher version first and then the lower one in case of failure.
  * Allow some extra time on RHEL for the optionals repo check in case the repository
    subscription is being managed externally.
2014-07-28 17:44:36 +01:00
Mathieu Le Marec - Pasquet
4e1e150025 aptpkg: restore support for lenny... 2014-07-28 12:30:56 +02:00
Erik Johnson
1858114027 Merge pull request #14541 from garethgreenaway/14530_ipv6_only_broken
Fixing debian_ip.py per #14530.
2014-07-27 21:53:39 -05:00
Gareth J. Greenaway
417c0740bc Fixing debian_ip.py per #14530. 2014-07-27 18:07:45 -07:00
Erik Johnson
d21af7c8b6 Merge pull request #14534 from garethgreenaway/2014.7_14426_apt_virtual_pkg
Switching the _get_virtual function to use pure python instead of a call to grep-available
2014-07-26 19:16:57 -05:00
Gareth J. Greenaway
d73c76e847 Switching the _get_virtual function to use pure python instead of a call to grep-available. 2014-07-26 17:13:08 -07:00
Thomas S Hatch
a9875fc6f7 Merge pull request #14524 from whiteinge/doc-hashutil
Add docs for the hashutil module
2014-07-25 21:52:57 -06:00
Seth House
3164b2164e Added hashutil module to docs index 2014-07-25 20:06:54 -06:00
Seth House
60e4de3fdd Removed hashutils functions without tests 2014-07-25 19:59:30 -06:00
Thomas S Hatch
0cd1236108 Merge pull request #14508 from whiteinge/salt-jinja-utils
Added utils module for working with hash functions
2014-07-25 18:48:49 -06:00
Seth House
adabf74852 Added utils module for working with hash functions 2014-07-25 16:12:37 -06:00
Thomas S Hatch
6e575491ee Merge pull request #14506 from whiteinge/netapi-client-config
Load netapi modules using client config instead of master config
2014-07-25 15:49:02 -06:00
Thomas S Hatch
4d6af812ff Merge pull request #14507 from whiteinge/salt-jinja-utils
Added utils-style IP-check functions to the network module
2014-07-25 15:48:56 -06:00
Seth House
ac6c7d0d6d Added utils-style IP-check functions to the network module 2014-07-25 15:20:14 -06:00
Seth House
c046f1cac7 Revert "Switch NetapiClient to use client_config instead of master_config"
This partially reverts commit 2bc1ed8afb.
2014-07-25 14:42:19 -06:00
Seth House
fd393f4a48 Load netapi modules using client config instead of master config 2014-07-25 14:12:48 -06:00
Thomas S Hatch
db5e572760 Merge pull request #14269 from whiteinge/test-dotlookup-notation
Add a bug fix plus tests for calling functions in Jinja via dot-lookup notation
2014-07-25 14:04:03 -06:00
Nicole Thomas
0674839ecd Merge pull request #14495 from cro/rhel7_pkgtests2
Extend dot-in-pkg test to RHEL 5 as well
2014-07-25 12:55:09 -06:00
Thomas S Hatch
023d123773 Merge pull request #14498 from whiteinge/doc-gpg-renderer-code-blocks
Fixed code-block directives in gpg renderer
2014-07-25 12:52:27 -06:00
C. R. Oldham
253de7a995 PyLint fix. 2014-07-25 12:48:07 -06:00
Seth House
0d8cc41c61 Added tests for calling functions via Jinja with dot-lookup syntax
Yay!
2014-07-25 12:27:45 -06:00
Seth House
5fdd866d12 Switch __salt__ to use the dot-lookup subclass 2014-07-25 12:27:45 -06:00
Seth House
2d8615c805 Added a dictionary subclass that supports dot-lookup notation 2014-07-25 12:27:45 -06:00
Seth House
2f97110ca8 Fixed code-block directives in gpg renderer 2014-07-25 12:02:14 -06:00
C. R. Oldham
f53e477735 Merge commit, resolve conflict 2014-07-25 11:16:22 -06:00
C. R. Oldham
89f115b25d Merge commit 2014-07-25 11:05:20 -06:00
C. R. Oldham
c94808689d Extend dot-in-pkg test to RHEL 5 as well 2014-07-25 10:57:18 -06:00
Thomas S Hatch
3fdf39134d Merge pull request #14490 from rallytime/tls_cli_examples
Added CLI examples to tls functions that were missing them
2014-07-25 10:46:45 -06:00
Thomas S Hatch
831021fe6a Merge pull request #14493 from thatch45/2014.7
Merge #14475 with lint fixes
2014-07-25 10:41:20 -06:00
Thomas S Hatch
84971cba7d Merge branch 'cro-rhel7_pkgtests' into 2014.7 2014-07-25 10:40:06 -06:00
Thomas S Hatch
288e9bba29 TABS?!?!? Really @cro ?? 2014-07-25 10:39:19 -06:00
Thomas S Hatch
35c3614f7f Merge branch 'rhel7_pkgtests' of https://github.com/cro/salt into cro-rhel7_pkgtests 2014-07-25 10:38:10 -06:00
rallytime
cb5b9d48c9 Added CLI examples to tls functions that were missing them 2014-07-25 10:23:14 -06:00
Thomas S Hatch
0a13fa6ea5 Merge pull request #14489 from thatch45/2014.7
lint fix
2014-07-25 10:22:14 -06:00
Thomas S Hatch
0577b4070b lint fix 2014-07-25 10:21:31 -06:00
Thomas S Hatch
f3e6841401 Merge pull request #14452 from s0undt3ch/hotfix/osx-pyt-nr
Skip test on Darwin after making an effort
2014-07-25 10:20:10 -06:00
Thomas S Hatch
14159615c8 Merge pull request #14268 from whiteinge/salt-runner-sync-async
Add sync/async Runner calls & sync/async Wheel calls that all respect eauth
2014-07-25 10:07:54 -06:00
Joseph Hall
f60063b6d8 Merge pull request #14487 from s0undt3ch/hotfix/transifex-updates
Update 'doc/.tx/config' - Build #123
2014-07-25 08:58:28 -06:00
Pedro Algarvio
4fa7d3ad64 Update 'doc/.tx/config' - Build #123
http://cookingwithsalt.org/job/salt/job/transifex/123/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
2014-07-25 15:57:15 +01:00
C. R. Oldham
1891b07856 Make this test check for diff packages on RHEL/Centos 6 vs 7 2014-07-24 19:11:56 -04:00
C. R. Oldham
b6f70ac80f Make this test check for diff packages on RHEL/Centos 6 vs 7 2014-07-24 19:09:52 -04:00
Seth House
73d798c117 Added timeouts to the Runner/Wheel sync calls 2014-07-24 16:19:40 -06:00
Seth House
bf9128362e Use WheelClient instead of the deprecated Wheel 2014-07-24 16:08:31 -06:00
Seth House
2bc1ed8afb Switch NetapiClient to use client_config instead of master_config
We access the Salt master through client interfaces and should use the
correct config when doing so. We should also reuse the already-loaded
opts when instantiating LocalClient().
2014-07-24 16:08:31 -06:00
Seth House
33043ef919 Added NetapiClient integration tests 2014-07-24 16:08:31 -06:00