Commit Graph

38715 Commits

Author SHA1 Message Date
rallytime
d44d3e6221 Add additional examples to grains.list_absent and grains.list_present
Fixes #22534
2015-04-10 10:31:22 -06:00
Thomas S Hatch
8d840aaade Merge pull request #22484 from EliRibble/fix-22472
Fix 22472
2015-04-10 09:57:13 -06:00
Thomas S Hatch
b7f54cdd07 Merge pull request #22521 from alprs/feature-service_force_reload
Add force argument to service to trigger force_reload
2015-04-10 09:56:24 -06:00
Thomas S Hatch
a62874dfb0 Merge pull request #22523 from hvnsweeting/fix-big-comment-for-failed-requisite
fix #20420: using other state's comment makes comment grow fast
2015-04-10 09:22:42 -06:00
Thomas S Hatch
0b4baa0c36 Merge pull request #22511 from The-Loeki/dnsutil-aaa
small enhancement to dnsutil module
2015-04-10 09:19:34 -06:00
Nicole Thomas
d80f258958 Merge pull request #22526 from dhs-rec/2014.7
Return 0 for good puppet return codes (0 and 2), 1 otherwise
2015-04-10 09:13:17 -06:00
Thomas S Hatch
2481e6cc63 Merge pull request #22464 from jacksontj/2014.7
2014.7: Fix Batching
2015-04-10 09:11:25 -06:00
Andreas Lutro
25db9adeb1 Add force argument to service to trigger force_reload 2015-04-10 16:42:23 +02:00
Dirk Heinrichs
36b9466d30 Return 0 for good puppet return codes (0 and 2), 1 otherwise 2015-04-10 12:58:14 +02:00
Viet Hung Nguyen
4a21515088 fix #20420: using other state comment makes comment grow fast
so just mention SLS.ID of that state to help user indicate
where the requisite failed.
2015-04-10 17:07:19 +07:00
Nicole Thomas
c75546362f Merge pull request #22517 from s0undt3ch/2014.7
Don't assume we're running the tests as root
2015-04-09 20:50:38 -06:00
Pedro Algarvio
1181a50d0d Don't assume we're running the tests as root 2015-04-10 00:52:32 +01:00
Eli Ribble
9f6f99f45f Fix pylint error 2015-04-09 15:19:37 -06:00
Ronald van Zantvoort
277929b426 Add version tag 2015-04-09 23:00:30 +02:00
Justin Findlay
38441a701c Merge pull request #22506 from rallytime/bp-20095
Backport #20095 to 2014.7
2015-04-09 13:42:39 -06:00
Ronald van Zantvoort
83cf03e653 small typo fix 2015-04-09 18:33:37 +02:00
Ronald van Zantvoort
333daa1bcc Modify A to use non-deprecated C function
Add AAAA function
2015-04-09 18:29:38 +02:00
Thomas Jackson
77395d76d8 Change to sets, we don't gaurantee minion ordering in returns 2015-04-09 09:06:59 -07:00
Colin Coghill
755c26e1b7 Handle pkgrepo keyids that have been converted to int. #19737 2015-04-09 09:07:16 -06:00
Thomas Jackson
7614f7ed10 Caste returns to sets, since we don't care about order. 2015-04-09 07:45:24 -07:00
Justin Findlay
0307ebe7ce Merge pull request #22381 from batulin-s/fix-portage_config-appending-accept_keywords
fix #22321 bug
2015-04-09 07:13:15 -06:00
Justin Findlay
6662853542 Merge pull request #22492 from davidjb/2014.7
Correctly report disk usage on Windows. Fix #16508
2015-04-09 07:11:36 -06:00
sergey.b
418fd9758e may be last fix #22321 bug 2015-04-09 13:00:45 +03:00
David\ Beitey
5d831ed01c Correctly report disk usage on Windows. Fix #16508
The GetDiskFreeSpace API call uses 32-bit unsigned ints, which causes it
to fail for large disks.  The GetDiskFreeSpaceEx method uses long
integers and avoids the need for several manual calcuations.

This also ensures the capacity reported rounds correct.  The previous
implementation was to convert the percentage directly to an int, slicing
off the decimal portion.

Conflicts:
	salt/modules/win_disk.py
2015-04-09 15:57:09 +10:00
Justin Findlay
bf1957a781 Merge pull request #22446 from br0ch0n/2014.7
Issue #20850 puppet run should return actual code
2015-04-08 22:51:43 -06:00
Nicole Thomas
c83e2d7c88 Merge pull request #22466 from whiteinge/doc-nested-dicts
Updated wording about nested dictionaries in states.file.managed docs
2015-04-08 17:01:36 -06:00
Nicole Thomas
8f0f5ae3f5 Merge pull request #22403 from hvnsweeting/enh-host-module-when-missing-hostfile
create host file if it does not exist
2015-04-08 16:53:47 -06:00
Eli Ribble
7daff3ba38 Allow multiple bucket contents caches based on prefix
Without this change multiple ext_pillar S3 directives would use the same
cache file even if using different buckets. Now the cache file is based
on the bucket name and prefix so that we can have multiple directives
working together without accidentally using each others caches

https://github.com/saltstack/salt/issues/22472
2015-04-08 16:37:25 -06:00
Eli Ribble
85380df810 Add the prefix to the pillar root when necessary
Without this if we are downloading a file from

s3://my-bucket/some/prefix/top.sls

Then we will save the cache file at

/var/cache/salt/master/pillar_s3fs/some/prefix/top.sls

But have a pillar root at

/var/cache/salt/master/pillar_s3fs/

Which will fail to find the top file. Now we add the prefix to the root
so that we properly find the files. One might argue we should instead
remove the prefix on download but that would cause conflict when pulling
multiple external pillars from the same s3 bucket with different
prefixes

https://github.com/saltstack/salt/issues/22472
2015-04-08 15:17:58 -06:00
Todd Stansell
3013583dda fix pylint issues 2015-04-08 13:58:16 -07:00
David Boucha
c9394fd779 Merge pull request #22477 from twangboy/fix_win_installer
Moved file deletion to happen after user clicks install
2015-04-08 14:27:05 -06:00
Thomas S Hatch
8ed97c5913 Merge pull request #22473 from EliRibble/fix-22472
Add the ability to specify key prefix for S3 ext_pillar
2015-04-08 13:27:37 -06:00
Brandon Rochon
4e2ab36b80 Issue #20850 puppet run should return actual code --lint fix 2015-04-08 12:26:45 -07:00
Joseph Hall
aa23eb0e26 Merge pull request #22448 from rallytime/migrate_old_cloud_config_docs
Migrate old cloud config documentation to own page
2015-04-08 12:32:35 -06:00
salt_build
6d99681b8d Moved file deletion to happen after user clicks install 2015-04-08 18:25:56 +00:00
Todd Stansell
8117e9f855 fix #21998 - use yum reposdir as basedir defaults
We now use the reposdir list of directories as the default set of repo
directories to manage.  When a new repo is created, it will be created in the
first directory in the list that exists.  Now that basedir is a list, you can
pass multiple directories in the basedir argument, separated by commas.
2015-04-08 10:44:12 -07:00
Eli Ribble
d96e470f9b Add the ability to specify key prefix for S3 ext_pillar
Users can use the prefix parameter to specify that pillar data should
come only from keys that start with the provided prefix. This allows
users to put pillar data in a 'subdirectory' of their bucket. It also
makes it easier to fully define pillars using S3 using a single bucket

See: https://github.com/saltstack/salt/issues/22472
2015-04-08 11:34:48 -06:00
Seth House
9a3a747d27 Updated wording about nested dictionaries in states.file.managed docs
Old wording was too ambiguous. Refs #22463
2015-04-08 09:44:47 -06:00
Thomas Jackson
30db262481 Add timeout to batch tests 2015-04-08 07:53:54 -07:00
Thomas Jackson
8d71c2b222 Cleanup pylint errors 2015-04-08 07:53:47 -07:00
Thomas Jackson
3e67cb54ff Re-work batching to more closely match CLI usage
In the regular CLI we consider a job as completed once all minions aren't running the job anymore. In this batching implementation we will ping all minions, wait up to timeout, then start the batching. In the event of minions returning during the batching we'll add them to the list of targets.
2015-04-08 07:53:39 -07:00
Thomas Jackson
b119faecf4 Stop chdir() in pcre minions 2015-04-08 07:53:31 -07:00
Thomas Jackson
10c6788502 Stop the os.chdir() to do glob 2015-04-08 07:53:24 -07:00
Thomas Jackson
87b364f764 More clear about CKMinions' purpose in the docstring 2015-04-08 07:53:14 -07:00
Thomas Jackson
63e28ba358 Revert "Just use ckminions in batch mode."
This reverts commit 6c5f3f8d2e.

We can't use ckminions since it is a gauranteed superset (not the exact set)
2015-04-08 07:53:03 -07:00
Thomas Jackson
29cf438d3c Fix CKMinions _check_range_minions
In the localclient the range return is already assumed to be a list of the minion_ids. This implementation assumed it was returning a list of fqdns, which makes for unecessary complications. In addition we were making the same range expand N times (N being the number of *total* minions)-- which is a LOT.

Conflicts:
	salt/utils/minions.py
2015-04-08 07:52:43 -07:00
rallytime
cecca10668 Kill legacy cloud configuration syntax docs per techhat 2015-04-07 20:09:37 -06:00
Seth House
d7b1f14133 Merge pull request #22445 from rallytime/fix-19044
Add docs explaing file_map upload functionality
2015-04-07 19:34:54 -06:00
rallytime
52a3d500e8 Beef up cloud configuration syntax and add pillar config back in 2015-04-07 18:56:40 -06:00
rallytime
9b5318fe71 Move old cloud syntax to "Legacy" cloud config doc 2015-04-07 18:41:21 -06:00