valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,559 Commits 24 Branches 182 Tags 341 MiB
2e68da3e52
Commit Graph

75559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
107fd322a6 Merge pull request #37373 from cloudflare/NAPALM-SNMP-STATE 
Napalm snmp state
 2016-11-03 12:13:33 +13:00
Mike Place
1f5daa15a6 Merge pull request #37372 from cloudflare/NAPALM-SNMP-MODULE 
Napalm snmp execution module
 2016-11-03 12:12:04 +13:00
Mike Place
038ad04c4c Merge pull request #37376 from gtmanfred/roster 
add default roster options to the master config
 2016-11-03 12:06:23 +13:00
Mike Place
2dd1843c9b Merge pull request #37403 from oz123/grains_doc_issue 
Make it clear that grains can exist in one place only
 2016-11-03 12:05:50 +13:00
Mike Place
51584c6ef5 Merge pull request #37405 from Tanoti/state_grains_exists 
Add state.grains.exists and unit tests
 2016-11-03 11:58:06 +13:00
Mike Place
fdd6192277 Merge pull request #37407 from cloudflare/NAPALM-GRAIN-DOCS 
Better examples for napalm grains
 2016-11-03 11:55:44 +13:00
Mike Place
26cbaebdbc Merge pull request #37417 from isbm/isbm-network-id-generator-bugfix 
Prevent theoretically possible None from being processed by getaddrinfo
 2016-11-03 11:44:22 +13:00
Mike Place
cc8435682a Merge pull request #37424 from kojiromike/gpg-no-append-method-on-string 
Avoid Early Convert ret['comment'] to String
 2016-11-03 11:43:08 +13:00
Mike Place
4c40525554 Merge pull request #37425 from gtmanfred/2016.11 
get cachedir_index add and del moved to __utils__
 2016-11-03 11:38:35 +13:00
Nicole Thomas
09878620c7 Merge pull request #37420 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-11-02 15:40:21 -06:00
Nicole Thomas
7864f9b79d Merge pull request #37419 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-11-02 15:40:04 -06:00
David Boucha
2d5609383c add example for not waiting for response (#37423) 2016-11-02 15:36:34 -06:00
Daniel Wallace
8df7f37d3b get cachedir_index add and del moved to __utils__ 2016-11-02 16:13:36 -05:00
Michael A. Smith
ceb7735476
Avoid Early Convert ret['comment'] to String 
Fixes this exception:
An exception occurred in this state: Traceback (most recent call last):
  File "/var/tmp/.syops_b1274f_salt/py2/salt/state.py", line 1733, in call
    **cdata['kwargs'])
  File "/var/tmp/.syops_b1274f_salt/py2/salt/loader.py", line 1652, in wrapper
    return f(*args, **kwargs)
  File "/var/tmp/.syops_b1274f_salt/py2/salt/states/gpg.py", line 119, in present
    ret['comment'].append('Adding {0} to GPG keychain'.format(name))
AttributeError: 'str' object has no attribute 'append'
 2016-11-02 15:49:56 -04:00
Erik Johnson
d749567f1e Fix regression in output for Ctrl-c'ed CLI jobs (#37416) 
https://github.com/saltstack/salt/pull/37115 backported a fix from
develop into 2016.3 and inadvertently broke a fix that I had initially
submitted in https://github.com/saltstack/salt/pull/36750. This commit
corrects this regression.
 2016-11-02 13:34:53 -06:00
rallytime
c31f879f8b Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/vmware.py
 2016-11-02 11:33:21 -06:00
Aditya Kulkarni
e9b4620fac Add unit tests for cloning from snapshot (#37414) 2016-11-02 11:22:37 -06:00
rallytime
bce47c9175 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-11-02 11:18:20 -06:00
Nicole Thomas
881c4b7120 Merge pull request #37411 from rallytime/merge-2016.11 
[2016.11] Merge forward from carbon to 2016.11
 2016-11-02 10:12:28 -06:00
Bo Maryniuk
d2ea0dc9c7 Prevent theoretically possible None from being processed by getaddrinfo 2016-11-02 16:54:48 +01:00
Nicole Thomas
8679ce4510 Back-port #37321 to 2016.11 (#37409) 
* status.uptime - avoid nawks srand, causes problems on smartos

* status.uptime - remove docs comment that no longer applies

* status.uptime - optimize a tiny it and get rid of the need for a shell

* status.uptime - actually remove the now redudent line too

* status.uptime - readded fallback to uptime binary, atleast we get something on the BSDs too now

* status.uptime - support python pre 2.7 as per damon-atkins

* status.uptime - want OpenBSD support

* status.uptime - want freebsd support, removed fallback once again so we are consistant

* status.uptime - want NetBSD support

* status.uptime - fold @jfindlay  work for OSX into mine, tweak mine based on his work

* status.uptime - push tests from @jfindlay with updates SunOS test

* status.uptime - remove cmd.run_all as it was replaced by sysctl.get

* status.uptime - attempt to fix sunos test

* Figured out why there was a cmd.run mock  was there.

* add note for SunOS, so we do not forget

* Update version added tag
 2016-11-02 09:50:30 -06:00
rallytime
d1a605e745 Merge branch 'carbon' into '2016.11' 
No conflicts.
 2016-11-02 08:48:28 -06:00
Jared McKnight
2e02763fa3 Allow specifying a VPC for named security groups 2016-11-02 10:38:08 -04:00
Sergey Kizunov
a09836cb12 Rename sys.exc_info() variables 
Clarify why we use 'del'.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-11-02 09:32:55 -05:00
Daniel Wallace
fd4df1be52 add documentation about roster_defaults 2016-11-02 09:29:03 -05:00
Daniel Wallace
61e1530fd1 first pass at adding roster_defaults 
Allow setting default user, password, etc to minions in salt-ssh
 2016-11-02 09:29:03 -05:00
Alexandru Bleotu
c68281b9fa Get cluster gh (#37310) 
* Added utils.vmware.get_cluster

- retrieves a cluster in datacenter based on its name

* Added tests for utils.vmware.get_cluster
 2016-11-02 08:28:41 -06:00
Mircea Ulinic
f17afd81e0
Correct versionadded 2016-11-02 13:32:42 +00:00
Mircea Ulinic
7d4ff3c2ca
Update dependency URL 2016-11-02 13:17:44 +00:00
Mircea Ulinic
1b6e92d1ed
Better examples for napalm grains & some lint + doc fixes 2016-11-02 13:11:35 +00:00
Mircea Ulinic
877ed8f1d5
Small typos 2016-11-02 12:01:19 +00:00
Mircea Ulinic
78cf63d0ef
Doc for the napalm snmp mod 2016-11-02 12:01:15 +00:00
Mircea Ulinic
419cd3cdf3
New execution module: napalm_snmp 2016-11-02 12:00:48 +00:00
Mircea Ulinic
0da5018cd5
Fix lint and use six.string_types 2016-11-02 11:56:39 +00:00
Mircea Ulinic
09e357f30a
Remove extra blank lines 2016-11-02 11:52:51 +00:00
Tanoti
3293340679 Add state.grains.exists and unit tests 2016-11-02 11:32:05 +00:00
Mike Place
ecd794a233 Merge pull request #37404 from saltstack/revert-37401-bootstrap_delay 
Revert "Bootstrap delay option for salt-cloud"
 2016-11-02 22:48:52 +13:00
Mike Place
e864de8f03 Revert "Bootstrap delay option for salt-cloud" 2016-11-02 22:48:39 +13:00
Oz N Tiram
c03a184212 Make it clear that grains can exist in one place in only 2016-11-02 10:03:15 +01:00
Mike Place
2eb44fbd11 Merge pull request #37401 from cachedout/bootstrap_delay 
Bootstrap delay option for salt-cloud
 2016-11-02 22:02:13 +13:00
Mike Place
6e42b0e157
Bootstrap delay option for salt-cloud 2016-11-02 22:01:20 +13:00
Mike Place
5232d7f60c Merge pull request #37336 from benediktwerner/spacewalk-api 
Spacewalk api
 2016-11-02 21:19:04 +13:00
Mike Place
d27946420c Merge pull request #37344 from cloudflare/NTP-STATE-MODULE 
Update for NTP state
 2016-11-02 21:15:05 +13:00
Mike Place
f8e06488b4 Merge pull request #37349 from haeac/Fix_Bug_#37118 
Pull request for Bug #37118
 2016-11-02 21:06:58 +13:00
Mike Place
9446e48da0 Merge pull request #37350 from pass-by-value/full_and_linked_clone_v1 
Add handling for full and linked clone
 2016-11-02 21:02:29 +13:00
Mike Place
f54840fde8 Merge pull request #37362 from skizunov/develop4 
Add --set-metadata option to salt-call
 2016-11-02 20:52:51 +13:00
Mike Place
e08290ed29 Merge pull request #37365 from skizunov/develop5 
PY3: Use `enter_context` instead of `push` for `ExitStack`
 2016-11-02 20:51:06 +13:00
Mike Place
42c23b1841 Merge pull request #37366 from eradman/requirements 
dev_python*.txt: use current SaltTesting and SaltPyLint modules
 2016-11-02 20:50:26 +13:00
Mike Place
421cfa6e66 Merge pull request #37368 from terminalmage/issue34101 
Overhaul archive.extracted state
 2016-11-02 20:45:05 +13:00
Mike Place
637eabf965 Merge pull request #37375 from lomeroe/lgpo_gpt_ini 
add updating gpt.ini file when ADM template policies are modified (gp…
 2016-11-02 20:08:21 +13:00