valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
73,029 Commits 24 Branches 182 Tags 341 MiB
816f8e8d0a
Commit Graph

73029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
816f8e8d0a Merge pull request #35768 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-25 12:01:47 -06:00
Nicole Thomas
0546b76d63 Revert "Template context must be populated with key:value pairs" (#35770) 2016-08-25 11:31:04 -06:00
rallytime
381debe53b Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/loader.py
 2016-08-25 10:14:38 -06:00
Thomas S Hatch
b3f6367621 Merge pull request #35753 from rallytime/fix-client-unit-test 
Fixup the unit.client_test.LocalClientTestCase.test_cmd_subset from #35720
 2016-08-25 09:55:23 -06:00
Nicole Thomas
197605ad91 Merge pull request #35735 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-25 09:43:35 -06:00
rallytime
92f8c836e8 Add cmd_mock back in to function spec 2016-08-25 07:05:52 -06:00
rallytime
a671f0a092 Fixup the unit.client_test.LocalClientTestCase.test_cmd_subset from #35720 
Refs #35720
 2016-08-24 17:48:45 -06:00
Nicole Thomas
dab8428c01 Add versionadded for enabled function in apache_module state (#35732) 
Refs #35458
 2016-08-24 13:49:11 -06:00
Nicole Thomas
bab0e3d449 Merge pull request #35737 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-24 13:48:45 -06:00
rallytime
61e37d5956 Merge branch '2015.8' into '2106.3' 
Conflicts:
  - salt/loader.py
  - salt/modules/s3.py
  - salt/utils/s3.py
  - tests/unit/modules/s3_test.py
 2016-08-24 09:58:56 -06:00
rallytime
748b5956b4 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/engines/sqs_events.py
  - salt/utils/gitfs.py
 2016-08-24 09:50:40 -06:00
Mike Place
7877ff1d5e Merge pull request #35729 from cachedout/fix_docs_build 
Remove docs mocks for msgpack and psutils
 2016-08-24 23:42:05 +09:00
Mike Place
fdbf01d5ad Remove docs mocks for msgpack and psutils 
Also make docs build py3 compat
 2016-08-24 22:55:11 +09:00
Mike Place
bd0790f5f7 Merge pull request #35374 from cachedout/issue_34434 
Allow for additional module validation functions.
 2016-08-24 17:32:54 +09:00
Mike Place
fa89917cd1 Merge pull request #35608 from eradman/no_top_contents 
Provide useful hints for error "No contents found"
 2016-08-24 17:18:49 +09:00
Mike Place
962e493304 Merge pull request #35628 from jf/fix_user.present_reporting_when_remove_groups=false 
Fix user.present state reporting for groups when remove_groups=false
 2016-08-24 17:15:30 +09:00
Mike Place
6e3e52a517 Merge pull request #35644 from xiaoanyunfei/patch-2 
Fix salt-syndic's log_level not consistent with salt-master​
 2016-08-24 17:12:42 +09:00
Mike Place
248776d704 Merge pull request #35655 from raazvvann/dev/rheghedu/shadow 
shadow module: fix return values && integration test
 2016-08-24 17:12:02 +09:00
Mike Place
935f8ebe9f Merge pull request #35666 from lyft/default-asg-termination-policy 
Add the ability to set default ASG termination policies in a pillar.
 2016-08-24 17:06:49 +09:00
Mike Place
e3bd42587e Merge pull request #35690 from DSRCorporation/bugs/35570_local_mode_for_run_and_key 
Return back local mode for salt-run and salt-key if not eauth.
 2016-08-24 17:04:37 +09:00
Mike Place
02d86c6550 Merge pull request #35696 from xiaoanyunfei/2016.3 
fix maximum recursion depth bug
 2016-08-24 17:01:16 +09:00
Mike Place
fea249c40c Merge pull request #35698 from kraney/boto_vpc_bugfix 
boto_vpc's delete_nat_gateway fails to remove elastic IPs associated with the NAT gatewa
 2016-08-24 16:47:32 +09:00
Mike Place
06a75be8bd Merge pull request #35701 from gtmanfred/2015.8 
use aws.get_location in s3 modules
 2016-08-24 16:46:30 +09:00
Mike Place
44efc3a162 Merge pull request #35704 from twangboy/win_whitelist 
Add whitelist for windows tests
 2016-08-24 16:42:05 +09:00
Mike Place
a6eaa277c3 Merge pull request #35707 from rallytime/jobs_runner_deprecations 
Remove outputter kwarg from jobs runner. It has been deprecated.
 2016-08-24 16:41:10 +09:00
Mike Place
54d6336a4a Merge pull request #35710 from skizunov/develop2 
Add `force_refresh` option to grains updating minion events
 2016-08-24 16:38:08 +09:00
Mike Place
665dbb12db Merge pull request #35711 from skizunov/develop3 
Refresh pillar only if minion is connected to master
 2016-08-24 16:37:07 +09:00
Mike Place
8d4d9e5725 Merge pull request #35712 from rallytime/utils_carbon_deprecations 
Template context must be populated with key:value pairs
 2016-08-24 16:36:33 +09:00
Mike Place
7b41a3a980 Merge pull request #35715 from jtand/snapper-test-diff-fix-py26 
Fix snapper_test for python26
 2016-08-24 16:34:55 +09:00
Mike Place
662ee7c3b9 Merge pull request #35718 from twangboy/seperate.nsis.scripts 
Add Minion Only Installer Script
 2016-08-24 16:09:48 +09:00
Mike Place
79d10aea2d Merge pull request #35720 from hu-dabao/fix-20575 
fix 20575, make subset really return random subset
 2016-08-24 16:03:58 +09:00
Hengyang Hu
70af980c01 fix 20575, make subset really return random subset 2016-08-23 21:35:01 -07:00
Evan Davis
453ab2f2d2 Add ability to set a default ASG termination policy. 2016-08-23 16:37:50 -07:00
twangboy
2ef1e00888 Add master build package build 2016-08-23 22:41:18 +00:00
twangboy
a3495d0852 Add minion only script 2016-08-23 22:37:17 +00:00
Justin Anderson
154dafdb89 Fix snapper_test for python26 2016-08-23 15:02:31 -06:00
Justin Anderson
63955392e4 os_family is Suse not SUSE (#35706) 2016-08-23 14:55:16 -06:00
Nicole Thomas
28f3ed47ca Don't assume we have a file to remove in tearDown (#35709) 
Some tests build the state file in the test itself and need to
be removed. However, some tests rely on sls files inside of the
integration file state tree. Therefore, in those tests, we have
nothing to remove.
 2016-08-23 14:43:55 -06:00
C. R. Oldham
79bc01b88c Make test runs behave better (#35708) 2016-08-23 14:15:48 -06:00
rallytime
adc4e0fdfe Template context must be populated with key:value pairs 
This situation has been on deprecation warning for a while to allow
people time to update their state files. For the Carbon release, we
are switching the warnings over to raise SaltInvocationErrors.
 2016-08-23 14:07:39 -06:00
Sergey Kizunov
694482b65c Refresh pillar only if minion is connected to master 
Added logic to refresh the pillar only if the minion is connected
to the master in `Minion.pillar_refresh()`. This matches the existing
logic in `Minion._post_master_init()`. This allows `pillar_refresh`
and `grains_refresh` events to be handled without throwing an exception
if the minion is not connected to the master (eg when `master_type` is
`disable`).

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-08-23 15:01:48 -05:00
Sergey Kizunov
39958d0b5f Add force_refresh option to grains updating minion events 
Added an optional `force_refresh` option to the events that
would update grains on the minion. These events are `module_refresh`,
`pillar_refresh`, and `grains_refresh`.

This allows for making sure that the grains are updated if the caller is
certain that something has happened that would change one or more grains
values.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-08-23 15:00:31 -05:00
Nicole Thomas
f3f068be72 Merge pull request #35702 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-23 13:40:50 -06:00
rallytime
caa113d390 Remove outputter kwarg from jobs runner. It has been deprecated. 2016-08-23 13:32:59 -06:00
twangboy
4951deed3e Add whitelist for windows tests 2016-08-23 11:22:24 -07:00
Nicole Thomas
5d0b9a248e Merge pull request #35700 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-23 11:23:40 -06:00
Daniel Wallace
2d2bc1ffea use aws.get_location in s3 modules 
Also load the __utils__ into pillar and fileserver and fileclient so
that this function can be used there with __opts__.

Also sets the default for s3 to 'us-east-1' like it is documented.

Closes #30976
Closes #28913
 2016-08-23 12:12:15 -05:00
Mihai Dincă
c80407ec4b Fix tests (#35693) 
* Fix tests/unit/modules/useradd_test.py::UserAddTestCase::test_info

* Fix unit/pyobjects_test.py::MapTests::test_map

* Fix tests/unit/pyobjects_test.py::RendererTests::test_extend

* Fix tests/unit/pyobjects_test.py::RendererTests::test_requisite_implicit_list
 2016-08-23 10:49:53 -06:00
rallytime
b80ef26cf2 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/cli/batch.py
  - salt/minion.py
  - salt/modules/cassandra_cql.py
  - salt/modules/rsync.py
 2016-08-23 10:44:55 -06:00
rallytime
9e9923c3f4 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-23 10:14:04 -06:00