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

69696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
beb54b3ffa Merge pull request #37086 from cachedout/mm_req 
Make salt-call a first-class citizen for multi-master
 2016-10-19 09:19:08 -06:00
Mike Place
7dc15c1a48
Lint utils 2016-10-19 16:45:54 +09:00
Mike Place
9bbe3c998b
Lint error in publish 2016-10-19 16:45:08 +09:00
Mike Place
e22a3d2be6
Add multi-master support to publish.publish 2016-10-19 16:42:32 +09:00
Mike Place
7f141ba38c
Add function to search for substr in list 2016-10-19 15:55:02 +09:00
Mike Place
007eef84d7
Extend support to event.fire_master 2016-10-19 15:42:50 +09:00
Mike Place
8171c73b00
Multi-master support for salt-call 2016-10-19 15:38:01 +09:00
Mike Place
6b94153ea6 Merge pull request #36898 from clinta/x509-fixes 
X509 fixes
 2016-10-19 12:03:43 +09:00
Mike Place
a32b8cd741 Merge pull request #37025 from cro/freebsd_no_proc 
Make salt.utils.minion._check_cmdline work on OSes without /proc.
 2016-10-19 12:00:10 +09:00
Mike Place
e09d9f85c5 Merge pull request #37050 from twangboy/fix_win_service_state 
Fix service state for Windows (DO NOT MERGE FORWARD)
 2016-10-19 11:46:27 +09:00
Mike Place
5e998638a4 Merge pull request #37076 from jfindlay/proxy_doc 
Document proxy settings
 2016-10-19 11:30:27 +09:00
Mike Place
9ec366833e Merge pull request #37081 from terminalmage/issue37001 
Fix archive.extracted remote source_hash verification
 2016-10-19 11:22:22 +09:00
Mike Place
67faee1f94 Merge pull request #37064 from cachedout/issue_35097 
Unify job check in scheduler
 2016-10-19 11:08:05 +09:00
Erik Johnson
a3c4deeb82 Fix archive.extracted remote source_hash verification 
When ``file.managed`` is invoked within an archive.extracted state to
pull down the source archive, ``file.extract_hash`` is invoked with
the unique name we created for it, rather than the actual source
filename. This causes hash extraction to fail, or only return a partial
match. Either of these cases causes the ``archive.extracted`` state to
fail.

This commit adds a new optional kwarg to ``file.get_managed`` which can
be used to override which filename we pass to ``file.extract_hash``, and
then passes this kwarg to the ``file.managed`` we invoke from within the
``archive.extracted`` state.
 2016-10-18 16:08:34 -05:00
Justin Findlay
7328df68f5 doc.topic.tutorials.http.query: add proxy section 2016-10-18 10:50:37 -06:00
Justin Findlay
331072b35d doc.topic.tutorials.http.query: add subheadings 2016-10-18 10:50:37 -06:00
Justin Findlay
478def4923 doc.ref.configuration.minion: add proxy vars 2016-10-18 10:50:37 -06:00
Nicole Thomas
7ef10f6de6 Merge pull request #37072 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-18 09:23:17 -06:00
rallytime
78a144f19a Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-18 09:16:21 -06:00
Clint Armstrong
e732fe7725 fix docs on CSR state 2016-10-18 08:38:54 -04:00
Clint Armstrong
9b6f1a336c fix quotes and remove dependency on pkg_resources 2016-10-18 08:38:41 -04:00
Mike Place
980ba892c9
Unify job check in scheduler 
Refs #35097
 2016-10-18 14:44:09 +09:00
Mike Place
71fd01ab8d Merge pull request #37049 from terminalmage/grains-docs 
Further clarification on new grains docs from #37028
 2016-10-18 10:47:57 +09:00
Mike Place
7dd91c2880 Merge pull request #37053 from rallytime/update-fedora-install-docs 
Update the Fedora installation docs
 2016-10-18 10:37:45 +09:00
Mike Place
9a6671ce69 Merge pull request #37057 from rallytime/cloud-utils-cleanup 
[2016.3] Update salt.utils.cloud references to __utils__ for cache funcs
 2016-10-18 10:31:43 +09:00
Erik Johnson
f8cd7b7b28 Merge pull request #36977 from twangboy/fix_cmd_run 
Remove whitespace from string commands
 2016-10-17 17:32:03 -05:00
Erik Johnson
854586c6a4 Add one more paragraph 2016-10-17 17:20:57 -05:00
Erik Johnson
a0502a7b90 Restructure grain writing docs 
Some information recently added is a little redundant. This commit edits
it and restructures the information to make it flow better.
 2016-10-17 17:03:05 -05:00
rallytime
d0dc7d4e55 [2016.3] Update salt.utils.cloud references to __utils__ for cache funcs 
Follow up to #35483
 2016-10-17 14:46:22 -06:00
Daniel Wallace
4eb0a89b7c remove options from pylint (#37054) 
These are going to be removed in pylint 1.6, and it doesn't appear that
we are using them, and just causes extra output.
 2016-10-17 14:24:25 -06:00
twangboy
b3b688e298 Fix tests 2016-10-17 13:31:55 -06:00
rallytime
24e0f5e024 Update the Fedora installation docs 
There are no packages available in EPEL starting with Salt version
2015.5.2 through 2016.3.2. Fedora packages are available in EPEL
starting with 2016.3.3. This PR adds a documentation note about this.
 2016-10-17 12:36:59 -06:00
twangboy
6586050736 Move strip to powershell block, add -NoProfile 2016-10-17 11:56:09 -06:00
twangboy
1e1ee786c9 Set service to manual if disabled on start 2016-10-17 10:48:40 -06:00
Erik Johnson
4e419e90ac Further clarification on new grains docs from #37028 2016-10-17 11:44:35 -05:00
Nicole Thomas
9378b22d80 Merge pull request #37048 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-17 10:05:48 -06:00
rallytime
5efd6d3df9 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-17 09:10:26 -06:00
Mike Place
7f5aced50e Merge pull request #36972 from zer0def/supervisor-state-fixes 
Mitigate case of starting an existing supervisord process group success reported as failure.
 2016-10-17 19:47:47 +09:00
Mike Place
104a153a1f Merge pull request #37028 from damon-atkins/update_topics_grains_doco 
Update topics/grains doco, about considerations before adding a Grain
 2016-10-17 18:54:21 +09:00
Damon Atkins
01e83a715e doc/topics/grains Update doco on when a grain should be created 2016-10-17 16:59:15 +11:00
Erik Johnson
4e2ad07b0f Prevent source files in /tmp from being deleted by file.managed states (#37023) 
Due to how the ``__clean_tmp()`` function works, if you use a source
file that is local to the minion but within the system's temp dir (e.g.
/tmp/foo.txt), it will be removed by the file.managed state. This stops
that by creating temp files with a specific prefix, and then only
cleaning files that match that prefix.
 2016-10-16 16:13:45 -06:00
Damon Atkins
a0e1fcc951 Add information to consider before adding a Grain to doco's for Grains 2016-10-16 01:17:38 +11:00
C. R. Oldham
1ac87e0efd Make salt.utils.minion._check_cmdline work on OSes without /proc. 2016-10-14 17:09:01 -06:00
Daniel Wallace
4e9824a65e args does not always exist (#37019) 
When using the reactor on a minion, if you call something like

```
highstate_run:
  caller.state.apply:
      - tgt: blog.gtmanfred.com
```

Then the args in kwargs doesn't exist, so set a default to a list
 2016-10-14 16:26:54 -06:00
Nicole Thomas
c30656814d Merge pull request #37012 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-14 12:07:03 -06:00
rallytime
a7c9a72104 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-14 11:01:09 -06:00
Sergey Kizunov
519e1dcba6 opkg: Support ignore_epoch argument in version comparisons (#37007) 
Based on PR #34531. Missed in that PR because it started at
2015.8 and the opkg module was added in 2016.3.

Based on change in that PR to `aptpkg.py`.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-10-14 10:51:25 -06:00
Thomas S Hatch
8b3e65448d Merge pull request #36808 from gtmanfred/beacons 
allow for closing stuff in beacons
 2016-10-14 09:50:08 -06:00
Erik Johnson
a02868b655 Make helper funcs private (#36993) 
This keeps them from being included in the docs and, more importantly,
hides them from the loader and keeps them out of the ``__salt__``
dunder.
 2016-10-14 08:52:08 -06:00
Erik Johnson
a75761de87 Merge pull request #36986 from jfindlay/arch_test 
modules.archive.unzip: zipfile is stdlib
 2016-10-13 16:38:00 -05:00