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
74,796 Commits 24 Branches 182 Tags 341 MiB
04d5b1852f
Commit Graph

74796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
msiebeneicher
04d5b1852f updated test_list_json_out test 2016-10-18 10:58:38 +02:00
msiebeneicher
d05ef0b209 Merge remote-tracking branch 'remotes/upstream/develop' into improvement/fix_log_output_for_json_and_yaml 
* remotes/upstream/develop: (257 commits)
  Removed extra whitespace
  add the ability to verify github webhook hmac signatures
  Improve the sparse docs on python renderer
  Remove trailing whitespace
  Letsencrypt has been renamed to certbot
  Add support for standalone mode
  Pass --quiet to suppress the certbot/letsencrypt dialog
  Fix failing network unit test (#37033)
  Use a default prefix for the mkstemp utils function (#37022)
  CkMinions.connected_ids fix: continue if cache.fetch raises exception
  fire on local (#37015)
  document master_type disable (#37014)
  opkg module: Add 'version', 'reinstall', and 'only_upgrade' to install (#37008)
  Keep minion schedule when recreate loaders. (#37004)
  Fix lint
  opkg: Support ignore_epoch argument in version comparisons (#37007)
  Revert "[2016.11.0rc1] (re)introduce minimal weighing to get_fqhostname"
  add webhook engine
  Versionadded for process_dependency_links kwarg in virtualenv_mod state (#37006)
  Versionadded tag for new update_head option in hg state (#37005)
  ...
 2016-10-18 10:43:02 +02:00
Mike Place
f54249f224 Merge pull request #37042 from oz123/document_py_renderer 
Improve the sparse docs on python renderer
 2016-10-18 16:20:48 +09:00
Mike Place
00453da22e Merge pull request #36813 from sjmh/feature/stalekey 
Add stalekey engine
 2016-10-18 12:10:11 +09:00
Mike Place
968b9e8c2d Removed extra whitespace 2016-10-18 11:07:42 +09:00
Mike Place
202414c88b Merge pull request #37024 from gtmanfred/hashutil 
add the ability to verify github webhook hmac signatures
 2016-10-18 10:55:28 +09:00
Nicole Thomas
9386697aee Merge pull request #37046 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-10-17 10:06:18 -06:00
rallytime
6d0cedcadd Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-17 09:06:12 -06:00
Daniel Wallace
a7f8ca0a84 add the ability to verify github webhook hmac signatures 2016-10-17 07:57:47 -05:00
Oz N Tiram
41330bbb88 Improve the sparse docs on python renderer 
Probable fix for #36963
 2016-10-17 06:53:56 -04:00
Mike Place
d26ddd25aa Merge pull request #36959 from davidjb/contributing-docs-md 
Change file extension of CONTRIBUTING.md to .rst
 2016-10-17 19:49:19 +09:00
Mike Place
6abe86e3d7 Merge pull request #36988 from vieira/debian-iproute2 
Use ip route instead of the deprecated route
 2016-10-17 19:45:36 +09:00
Mike Place
27de69ef65 Merge pull request #36990 from twangboy/remove_dup_functions_dsc 
Remove duplicate psget functions from dsc module
 2016-10-17 19:44:59 +09:00
Mike Place
9893717c09 Merge pull request #36992 from zhihan/fix-mac-package-wildcard 
Fix mac_package wildcard install error on mac
 2016-10-17 19:38:12 +09:00
Mike Place
a97b7021b3 Remove trailing whitespace 2016-10-17 19:37:57 +09:00
Mike Place
61af0ac761 Merge pull request #37020 from rallytime/fix-35388 
CkMinions.connected_ids fix: continue if cache.fetch raises exception
 2016-10-17 19:18:52 +09:00
Mike Place
18ca2ca975 Merge pull request #37036 from vodik/certbot 
Certbot support for the acme module/state
 2016-10-17 18:46:07 +09:00
Simon Gomizelj
0053e40dc0 Letsencrypt has been renamed to certbot 
Prefer certbot if present, its a drop-in replacement for the old
Letsencrypt binary.
 2016-10-16 23:12:07 -04:00
Simon Gomizelj
4e8f70c0c0 Add support for standalone mode 2016-10-16 23:09:50 -04:00
Simon Gomizelj
bf8f3735c1 Pass --quiet to suppress the certbot/letsencrypt dialog 
Avoids the "Error opening terminal: unknown. Please see the logfile
'certbot.log' for more details." error.
 2016-10-16 23:05:40 -04:00
Erik Johnson
210a60fe5e Fix failing network unit test (#37033) 
The IP for www.saltstack.com appears to have changed, which is causing
this test to fail.
 2016-10-16 16:13:19 -06:00
Erik Johnson
1caf1f6770 Use a default prefix for the mkstemp utils function (#37022) 
* Move salt.utils.mkstemp() into salt.utils.files

Also use a default prefix

* update refs to salt.utils.mkstemp

* Update test to use new path to mkstemp helper func
 2016-10-16 16:12:56 -06:00
Nicole Thomas
8fb7dd2422 Merge pull request #37017 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-10-14 15:02:39 -06:00
Nicole Thomas
b6c43a805f Merge pull request #37016 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-14 15:02:10 -06:00
rallytime
c7fffed729 CkMinions.connected_ids fix: continue if cache.fetch raises exception 
In releases <= 2016.3.x, when running the CLI as a non-root user, we
did not explicitly raise an error when the cache files for connected
minions could not be accessed.

In PR #35388, a SaltCacheError is being explicitly raised when the
cache file permissions are denied. This PR restores the behavior to
the non-root CLI user to continue through the minion id loop when
the data file can't be accessed, instead of stack tracing.

Fixes #36867
 2016-10-14 14:41:20 -06:00
Daniel Wallace
d162fac68d fire on local (#37015) 
if local is set to True, file_client is local, or master_type is disable
 2016-10-14 12:25:29 -06:00
Daniel Wallace
2a4c9ac4f3 document master_type disable (#37014) 2016-10-14 12:24:12 -06:00
Sergey Kizunov
ead0abbe85 opkg module: Add 'version', 'reinstall', and 'only_upgrade' to install (#37008) 
Add support for the options `version`, `reinstall`, and `only_upgrade`
to the `install()` function of the `opkg` module. These options reflect
the behavior of the same options in the `aptpkg` module.

This also adds support to using a format for the `pkgs` option that looks
like:

```
pkgs='["foo", {"bar": "1.2.3-0ubuntu0"}]'
```

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-10-14 12:08:53 -06:00
Dmitry Kuzmenko
b6c7723c21 Keep minion schedule when recreate loaders. (#37004) 2016-10-14 12:08:12 -06:00
rallytime
b7d9bf0281 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-14 12:06:31 -06:00
rallytime
112dc5d9c1 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cli/salt.py
  - salt/client/__init__.py
  - salt/modules/archive.py
  - tests/integration/modules/pkg.py
 2016-10-14 12:03:08 -06:00
twangboy
792e35c8f9 Fix lint 2016-10-14 11:23:05 -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
3d92cd6b0f Merge pull request #37010 from saltstack/revert-36870-carbons-domain-grainfix 
Revert "[2016.11.0rc1] (re)introduce minimal weighing to get_fqhostname"
 2016-10-14 10:31:10 -06:00
Thomas S Hatch
933fb93e82 Revert "[2016.11.0rc1] (re)introduce minimal weighing to get_fqhostname" 2016-10-14 10:26:26 -06:00
Thomas S Hatch
7bc94a1b4d Merge pull request #36911 from gtmanfred/event_send 
send event on minion event stream if masterless
 2016-10-14 10:18:46 -06:00
Thomas S Hatch
8e714dbaba Merge pull request #36982 from gtmanfred/webhook 
[RFC] add webhook engine
 2016-10-14 10:16:52 -06:00
Daniel Wallace
daf474a6eb add webhook engine 2016-10-14 11:08:05 -05:00
Thomas S Hatch
11962a96cb Merge pull request #36870 from sjorge/carbons-domain-grainfix 
[2016.11.0rc1] (re)introduce minimal weighing to get_fqhostname
 2016-10-14 09:58:28 -06:00
Thomas S Hatch
246439e81b Merge pull request #36864 from sjorge/carbon-x509-pemparse 
[2016.11.0rc1] module.x509 did not handle mine.get output properly
 2016-10-14 09:56:59 -06:00
Thomas S Hatch
57c82482e5 Merge pull request #36848 from ilyakoganus/highstate_returner 
Added HTML email highstate results returner
 2016-10-14 09:52:06 -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
Nicole Thomas
920a886ba8 Versionadded for process_dependency_links kwarg in virtualenv_mod state (#37006) 2016-10-14 09:48:40 -06:00
Nicole Thomas
2b054c7972 Versionadded tag for new update_head option in hg state (#37005) 2016-10-14 09:48:26 -06:00
Derek
a6dcbbd162 add process_dependency_links flag to virtualenv_mod state (#36997) 2016-10-14 09:41:19 -06:00
Daniel Hobley
0aa6ecfb7f Add the option to skip updating the head for a hg latest state (#37002) 
- Updated hg state tests
 2016-10-14 09:07:33 -06:00
Jorge Schrauwen
c3ae83f533 zpool grains should just be a list (#36999) 
* zpool grains should just be a list

* reinstroduce size for zpool grain
 2016-10-14 08:53:36 -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
Zhi Han
3ddddd82b7 Fix mac_package wildcard install error on mac 2016-10-13 21:29:40 -04:00
twangboy
0e36b7db72 Remove duplicate psget functions from dsc module 2016-10-13 17:02:33 -06:00