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
78,022 Commits 24 Branches 182 Tags 341 MiB
c00a99673a
Commit Graph

78022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lomeroe
8c0dc9162a correct issue when running get with return_not_configured=True (#39085) 
lint indentation fixes
 2017-02-02 16:04:42 -07:00
lomeroe
26eea61678 have _in_range_inclusive function attempt to convert a string to an int for the test (allow string based numbers to be verified to be in range). Specifically, this allows the CachedLogonsCount policy to be set (stored in the registry as a REG_SZ and specified as a string number when passed to the module) (#39086) 2017-02-02 16:03:44 -07:00
rallytime
4595f81685 [PY3] Sort return data and mock data for testing stability 2017-02-02 22:56:00 +00:00
rallytime
ee2edda14e [PY3] Test comment contents more carefully for list stability 
Stabilizes these tests by avoiding errors when cheese, crackers
order changes in the comment and gives errors like:

-  'comment': 'Kernel modules crackers, cheese are already present',
?                                     --------

+  'comment': 'Kernel modules cheese, crackers are already present',
?                            ++++++++
 2017-02-02 22:34:20 +00:00
a-schuurman
cddcb99a53 Added ipv4 arg to connect_container_to_network 2017-02-02 22:58:19 +01:00
Mike Place
f58ccdde6a Merge pull request #39093 from cachedout/zd_1151 
Add a function to list extmods
 2017-02-02 14:08:19 -07:00
Mike Place
d76ebdaaed Accidentially overwrote lint commit 2017-02-02 14:08:07 -07:00
Mike Place
56cb200cf8 Merge pull request #39027 from cloudflare/REDIS-CACHE 
Redis cache plugin
 2017-02-02 13:27:26 -07:00
Mike Place
8a24cad919 Merge pull request #39004 from markuskramerIgitt/compile_offline3 
Compile offline3
 2017-02-02 13:20:38 -07:00
Mike Place
c69dd4778b
Avoid reserved kw 2017-02-02 13:06:47 -07:00
Mike Place
56ca9892b1 Fix six import 2017-02-02 12:54:30 -07:00
Mike Place
b3ad1eebd7 Merge pull request #39092 from jacobweinstock/add-pillar-data-override-in-state-sls-id 
add ability to override pillar data during state.sls_id run.
 2017-02-02 12:33:08 -07:00
Mike Place
1f210ee0e3 Merge pull request #39130 from garethgreenaway/develop 
Fix when targeting via pillar with Salt syndic
 2017-02-02 12:28:02 -07:00
Mike Place
4eec641b65 Merge pull request #38970 from gtmanfred/2016.11 
when using local_cache we have to pass the list of minions
 2017-02-02 12:24:38 -07:00
C. R. Oldham
8e6c155ead MANY dunder variable fixes for proxies + proxy keepalive from @mirceaulinic (#38829) 
* Add proxy keep alive options

* Documentation for the alive function

* MANY dunder variable fixes for proxies.

* Lint.

* Lint.

* More Lint.
 2017-02-02 11:35:40 -07:00
Eric Radman
c22f3f6dc7 Allow pillar environment to be specified for salt-run 
Example:
  salt-run state.sls deploy saltenv=base pillarenv=dev
 2017-02-02 13:19:20 -05:00
Mircea Ulinic
fa2b6a63ee Remove CLI restriction 2017-02-02 17:41:33 +00:00
Gareth J. Greenaway
a52c3d96ba Missing colon 2017-02-02 09:30:24 -08:00
rallytime
42df555d82 Rework how the loader pulls in minion opts in namecheap utils file 2017-02-02 10:12:58 -07:00
rallytime
a6fdfcb4fa Fix some spelling errors and remove unecessary doc modules 2017-02-02 10:12:58 -07:00
rallytime
d398c5f7ee Update autodoc topics for new modules added in develop 
Also adjusted versionadded tags as necessary on the files that
are getting new autodoc files added.
 2017-02-02 10:12:58 -07:00
Nicole Thomas
8cd74af1e4 Merge pull request #39129 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-02 10:10:20 -07:00
Gareth J. Greenaway
75526f80c3 Merge remote-tracking branch 'upstream/develop' into develop 2017-02-02 09:06:48 -08:00
C. R. Oldham
cd8077ab81 Merge pull request #38804 from alexbleotu/root_dir_fix-2016.3-gh 
Second attempt to fix prepending of root_dir to paths
 2017-02-02 09:10:36 -07:00
10ne1
412615ec5a grains/core: Populate hw info for ARM devices (#38992) 
Linux ARM targets use U-BOOT / fw_printenv and have no SMBIOS /
dmidecode installed. Set the manufacturer and serial number grains
using fw_printenv.

Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
 2017-02-02 08:57:54 -07:00
Erik Johnson
75da6f461b Fix archive.list on Windows (#39128) 
The external_error ZipInfo attribute is handled differently on Windows,
so resort to the filename attribute instead.
 2017-02-02 08:44:53 -07:00
Nicole Thomas
f2c309af73 Back-port #36714 to 2016.11 (#39133) 
* Fix: local variable result referenced before assignment

* Fix: if 'path' variable is None convert it into an empty string
 2017-02-02 08:35:46 -07:00
Ivan Babrou
6ffeda3ee5 Clarify ipv6 option for minion and inteface for master, closes #39118 (#39131) 
* Clarify ipv6 option for minion and inteface for master, closes #39118

* Add ipv6 reference
 2017-02-02 08:35:00 -07:00
rajvidhimar
48fa18d57e Enhance install_config and install_os 2017-02-02 18:18:18 +05:30
Alexandru Bleotu
b3bdd3b04a Add missing whiteline 2017-02-02 10:23:22 +00:00
Alexandru Bleotu
c7715acd53 Merge pull request #3 from cro/ab_rootdirfix 
When running testsuite, salt.syspaths.ROOT_DIR is often empty.
 2017-02-02 10:02:18 +00:00
rallytime
eb61788f87 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/runners/all/index.rst
  - salt/modules/win_lgpo.py
  - salt/states/dockerio.py
 2017-02-01 16:36:45 -07:00
Gareth J. Greenaway
26cb35df25 Merge remote-tracking branch 'upstream/develop' into develop 2017-02-01 15:34:42 -08:00
Gareth J. Greenaway
19eed77fb0 Fixing a weird edge case when using salt syndics and targetting via pillar. Without this fix the master of masters ends up in an infinite loop since the data returned from the minions is differently structured than if a sync was not in use. 2017-02-01 15:34:35 -08:00
Mircea Ulinic
06c8899e20 do instead of set 2017-02-01 23:11:56 +00:00
Mircea Ulinic
60b6caa502 Jinja topic doc: logs subsection 2017-02-01 23:11:56 +00:00
Mircea Ulinic
9a560ff9bb Log module 2017-02-01 23:11:51 +00:00
Mike Place
4480bd8858 Merge pull request #39114 from cloudflare/BGP-RUNNER 
New networking runner: BGP
 2017-02-01 16:05:08 -07:00
C. R. Oldham
e8cbafaaf1 When running testsuite, salt.syspaths.ROOT_DIR is often empty. 2017-02-01 15:57:38 -07:00
lomeroe
8b34fcdb45 correct checking of policy_class to compare with lower() version of the specified string (#39084) 2017-02-01 15:51:34 -07:00
lomeroe
8ce928f050 Backport #38779 to 2016.11 (#39089) 
* ignore ADMX/ADML files with syntax errors

* narrow except for XML Syntax Error on admx file

* attempt to remove any "encoding='unicode'" from ADMX/ADML files if lxml does not support the encoding

* lint fixes

* fix bonehead typo
 2017-02-01 15:50:42 -07:00
lomeroe
8a00ecfb79 update adml text search to use 'starts-with' as some policies text has trailing spaces (#39090) 2017-02-01 15:43:01 -07:00
lomeroe
9dccb9fbe3 correctly handle scenario when "storeAsText" is True on a decimal/longDecimal element object (#39088) 
handle scenario that gpedit has not been run on a system (Machine and User GroupPolicy sub-folders do not exist)
handle scenario that startup/shutdown script policy file does not exist
 2017-02-01 15:26:13 -07:00
Erik Johnson
646b9ea4e5 Don't abort pillar.get with merge=True if default is None (#39116) 
* Don't abort pillar.get with merge=True if default is None

This prevents a SaltInvocationError from being raised if the default is
loaded from a import_yaml jinja macro and the file being loaded is empty
(which is an entirely valid use case). In these cases, the loaded
default would be None, which we don't want to cause an exception.

* Add test case for issue 39062
 2017-02-01 15:07:31 -07:00
Nicole Thomas
50d72da3f6 Merge pull request #39122 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-02-01 14:41:58 -07:00
rallytime
a782b00ee1 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/cloud/clouds/openstack.py
 2017-02-01 13:35:10 -07:00
Jacob Weinstock
c6ad5d0ac3 use the pillar kwarg explicitely 2017-02-01 12:44:27 -07:00
Jacob Weinstock
8ec3e08664 add ability to override pillar data during state.sls_id run. 2017-02-01 12:44:27 -07:00
Mike Place
6100467288 Merge pull request #39036 from cro/no_docs_develop 
Add CLI Examples so tests will pass (counterpart to #39035)
 2017-02-01 12:31:29 -07:00
Mike Place
ceccb14ffd Merge pull request #39050 from The-Loeki/cache-roster2 
Introduction of a new Salt-SSH cache roster with vastly expanded options
 2017-02-01 12:25:24 -07:00