valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
83,185 Commits 24 Branches 182 Tags 341 MiB
fb008e6f84
Commit Graph

83185 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
d7ecd3c149 Merge branch '2017.7' into 'develop' 
No conflicts.
 2017-06-14 13:35:50 -06:00
rallytime
65cf36f607 Use salt.utils.versions file for LooseVersion in 2017.7 2017-06-14 13:34:34 -06:00
rallytime
16a2747d7d Merge branch '2016.11' into '2017.7' 
Conflicts:
  - pkg/windows/buildenv/salt.bat
  - salt/modules/pillar.py
  - salt/utils/openstack/nova.py
  - tests/unit/cloud/clouds/test_dimensiondata.py
  - tests/unit/cloud/clouds/test_gce.py
 2017-06-14 13:31:42 -06:00
rallytime
89834e49c2 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - conf/master
  - salt/utils/schedule.py
 2017-06-14 13:24:11 -06:00
garethgreenaway
edcafc6a26 Merge pull request #41692 from rallytime/fix-40155 
Add boto and boto3 version dependencies to boto_vpc state docs
 2017-06-14 12:05:06 -07:00
Erik Johnson
698806fb09 No need to manually create pkg_params dict when name and version passed 
This was an incorrect fix, the fix should have been made in
pkg_resource.parse_targets. Now that it is fixed there, this is not
needed.
 2017-06-14 14:03:26 -05:00
Mike Place
afa01f0cc9 Merge pull request #41744 from twangboy/docs_win_add_firewall 
Add instructions for Opening Windows Firewall for Salt
 2017-06-14 13:53:07 -05:00
Erik Johnson
f1d7eb4166 Add comparison operator feature to Oxygen release notes 2017-06-14 13:47:49 -05:00
Erik Johnson
6a81030745 jmespath is a dep of boto3, include it in boto3 import attempt 2017-06-14 13:41:07 -05:00
Erik Johnson
bdaeb55a77 Merge pull request #40902 from lorengordon/pillar-get-merge-lists 
Removes duplicates when merging pillar lists and adds pillar.get override for pillar_merge_lists
 2017-06-14 13:39:08 -05:00
Erik Johnson
226f226392 Update documentation for comparison operators in pkg.installed state 2017-06-14 13:27:29 -05:00
Erik Johnson
a268227883 Use salt.utils.pkg.split_comparison in pkg states 2017-06-14 13:24:33 -05:00
Erik Johnson
444e45b8e8 Add support for comparison operators to pkg.install (yum/dnf, apt) 2017-06-14 13:21:02 -05:00
rallytime
2b51a20d02 Replace "nitrogen" references with 2017.7.0, too! 2017-06-14 12:20:45 -06:00
rallytime
cc07664a9f Replace Nitrogen with 2017.7.0 in remain directories 2017-06-14 12:18:37 -06:00
Erik Johnson
5c970d81e5 Fix runtests_helpers.modules_available when multiple modules passed 
tests.support.helpers passes the single-asterisk tuple of args as
individual arguments to runtest_helpers.modules_available. This breaks
tests which pass more than one argument to the requires_salt_modules
decorator.

This has been fixed by making runtests_helpers.modules_available accept
an arbitrary number of args via using a single-asterisk.
 2017-06-14 13:16:30 -05:00
rallytime
00ecda1002 Replace Nitrogen references with 2017.7.0 in modules/* 2017-06-14 12:14:27 -06:00
Erik Johnson
23634a305b Fix runtests_helpers.modules_available when multiple modules passed 
tests.support.helpers passes the single-asterisk tuple of args as
individual arguments to runtest_helpers.modules_available. This breaks
tests which pass more than one argument to the requires_salt_modules
decorator.

This has been fixed by making runtests_helpers.modules_available accept
an arbitrary number of args via using a single-asterisk.
 2017-06-14 13:12:27 -05:00
rallytime
67368b07da Replace Nitrogen with 2017.7.0 for the following directories: 
- netapi
- output
- pillar
- proxy
- renderers
- returners
- roser
- runners
- sdb
 2017-06-14 11:59:55 -06:00
rallytime
b0145578bf Update Nitrogen references to 2017.7.0 for states, utils, tests directory 
Also updated version.py with release tuple
 2017-06-14 11:54:27 -06:00
garethgreenaway
54dcbcadb3 Merge branch 'develop' into 41618_runner_return_event_bad_function 2017-06-14 10:46:46 -07:00
Erik Johnson
d3ef32e1c3 Use salt.utils.pkg.split_comparison to get comparsion prefix 2017-06-14 12:42:43 -05:00
twangboy
795a1aab4f Add instructions for Windows Firewall 2017-06-14 11:42:00 -06:00
Erik Johnson
3fae948fdf salt.utils.pkg: add functions for matching a version comparison expression 2017-06-14 12:41:30 -05:00
Gareth J. Greenaway
efa3c8e653 removing unneeded comments 2017-06-14 10:40:06 -07:00
Gareth J. Greenaway
78052ff00e Updating the unit test for libvirt to include coverage for new options 2017-06-14 10:40:06 -07:00
Gareth J. Greenaway
95b9973a5d removing rogue space 2017-06-14 10:40:06 -07:00
Gareth J. Greenaway
61b644de7d Fixing lint errors 2017-06-14 10:40:06 -07:00
Gareth J. Greenaway
0bcdb6b246 Moving expiration_days to previous line 2017-06-14 10:40:06 -07:00
Gareth J. Greenaway
2ceb40b8a9 Removing rogue parens. 2017-06-14 10:40:06 -07:00
Gareth J. Greenaway
02ae3c63b1 Adding versionadded tags 2017-06-14 10:40:06 -07:00
Gareth J. Greenaway
89bdc50f4e Adding the ability to configure some options when generating libvirt keys, particularly the number of days that the certificates will be valid for. 2017-06-14 10:40:06 -07:00
Erik Johnson
dfb22f0841 pkg.installed: Pass ignore_epoch to pkg.install 2017-06-14 12:37:16 -05:00
rallytime
c5b75d030a Update Nitrogen references to 2017.7.0 in doc/* 2017-06-14 11:36:06 -06:00
Erik Johnson
d1990a5822 Fix ImportError in boto3_sns module 
This module attempts to import jmespath which is not a dependency and is
not in the stdlib. This commit gates this behind a try/except to
prevent an ImportError from being logged.
 2017-06-14 12:31:36 -05:00
Mike Place
b095ce8798 Merge pull request #41278 from jettero/mongodb-grant/set-roles 
combine mongodb_user/mongodb_database and add role grant/set methods
 2017-06-14 12:31:30 -05:00
Mike Place
bacdf4e9eb Merge pull request #41449 from sebw/svn-bug-41022 
Fix state "svn.latest" diff output in test mode
 2017-06-14 12:28:23 -05:00
garethgreenaway
203ec6730f Merge pull request #41723 from rallytime/libcloud-support 
Support apache-libcloud work-around for issue #32743 for versions older than 2.0.0
 2017-06-14 10:13:38 -07:00
Erik Johnson
7484bcc6c6 parse_targets: include version in packed return data 2017-06-14 12:02:53 -05:00
garethgreenaway
c5a79a1ea6 Merge pull request #41695 from xiaoanyunfei/fixRecursion 
fix max RecursionError, Ellipsis
 2017-06-14 09:57:05 -07:00
Erik Johnson
585145f4b3 parse_targets: include version in packed return data 2017-06-14 11:53:17 -05:00
Mike Place
62dbf5083c Merge pull request #41655 from Enquier/nova-cloud-set_ip_address 
Allow Nova cloud module to set a specific floating ip address
 2017-06-14 11:44:04 -05:00
Erik Johnson
e5f3d08751 Fix spurious error when glob/regex used in publisher_acl 
An error is logged if any of the publisher_acl targets is not present in
the available usernames (as derived using pwd.getpwall()). However, at
some point publisher_acl was expanded to support globs and regexes to
specify user names. When this was done, the code which checks the
publisher_acl entries against the available users was not updated. This
results in spurious errors in the log when this code tries to look for a
regex or glob expression in the list of available usernames.

However, there is no real reason for this check, as all it does is run
pwd.getpwnam() on the publisher_acl entry, and it does this only when
the entry is not in the list of available users. So there is no way for
this to do anything but raise a KeyError.

The if block which checks the entry against the list of available users
has therefore been removed.
 2017-06-14 11:34:21 -05:00
garethgreenaway
8e13818833 Merge branch 'develop' into 41618_runner_return_event_bad_function 2017-06-14 08:57:29 -07:00
Mike Place
9e6eda8446 Merge pull request #41729 from bodhi-space/infra5027 
INFRA-5027 - fix tagging for managed instances
 2017-06-14 10:56:30 -05:00
Mike Place
3babe2a049 Merge pull request #41727 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-06-14 10:44:39 -05:00
twangboy
45975e299e Remove reference to Salt Enterprise 2017-06-14 09:39:29 -06:00
rallytime
1e9a06000b Bump version check down to 1.4.0 and use distutils.version lib 2017-06-14 09:30:22 -06:00
Nicole Thomas
82eab84883 Merge pull request #41731 from terminalmage/docs 
Clarify that archive_format is required pre-2016.11.0
 2017-06-14 09:05:20 -06:00
Daniel Wallace
fa9023c9e0 remove byte 
This does not need to be bytes because we are only storing the hashes, and not
user files
 2017-06-14 08:52:11 -06:00