valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
74,452 Commits 24 Branches 182 Tags 341 MiB
0aab883180
Commit Graph

74452 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Denys Havrysh
c7cf79e959 cp.get_url: add note and test for https:// URL with `dest=None` 2016-10-17 17:39:52 +03:00
Denys Havrysh
ff55f77179 cp.get_url: write more verbose docstring 2016-10-17 16:01:02 +03:00
Denys Havrysh
94a34a08ba cp.get_url: add integration tests 2016-10-17 15:46:49 +03: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
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
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
Denys Havrysh
983f82fcf4 cp.get_url: fix variable type check 2016-10-17 13:06:29 +03: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
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
Bo Maryniuk
c11940d14c Fix status.uptime for Solaris 9, 10 and 11. 2016-10-15 21:04:29 +02: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
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
2a4c9ac4f3 document master_type disable (#37014) 2016-10-14 12:24:12 -06:00
Dmitry Kuzmenko
b6c7723c21 Keep minion schedule when recreate loaders. (#37004) 2016-10-14 12:08:12 -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
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
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
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
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
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
twangboy
427be7b422 Add versionadded 2016-10-13 17:20:35 -06:00
twangboy
0e36b7db72 Remove duplicate psget functions from dsc module 2016-10-13 17:02:33 -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
C. R. Oldham
c7595b84a7 Merge pull request #36981 from rallytime/upgrades-test-fix 
Skip pkg.upgrades test on distros other that Suse in 2016.3
 2016-10-13 15:29:36 -06:00
C. R. Oldham
0b11f05d07 Merge pull request #36980 from rallytime/fedora-upgrades-test-fix 
Skip pkg.upgrade test if pkg install/upgrade has problems
 2016-10-13 15:29:29 -06:00
Justin Findlay
2ec2684860 modules.archive.unzip: zipfile is stdlib 2016-10-13 15:29:14 -06:00
Thomas S Hatch
6b782c15e1 Merge pull request #36755 from terminalmage/issue36671 
systemd.py: check retcode for service availability in systemd >= 231
 2016-10-13 13:41:50 -06:00
Thomas S Hatch
c6254d59fd Merge pull request #36807 from terminalmage/issue36723 
Fix pillar merging when ext_pillar_first is enabled
 2016-10-13 13:40:55 -06:00
Thomas S Hatch
10d255c511 Merge pull request #36750 from terminalmage/issue36746 
Add the CLI client and pub_data as class attributes
 2016-10-13 13:38:33 -06:00
rallytime
a5ae737057 Skip pkg.upgrades test on distros other that Suse in 2016.3 
Refs #36450 and #36980
 2016-10-13 12:02:22 -06:00
rallytime
21921af9a7 Skip pkg.upgrade test if pkg install/upgrade has problems 
Refs #36450
 2016-10-13 11:57:27 -06:00
Nicole Thomas
db46231cfb Merge pull request #36976 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-13 11:42:07 -06:00
rallytime
1e7f56c4bb Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-13 10:38:19 -06:00
Nicole Thomas
a8eee6e90b Update the ip to test against in unit.utils.network_test.NetworkTestCase.test_host_to_ip (#36975) 2016-10-13 10:25:58 -06:00
C. R. Oldham
41a96aefae Move authentication from esxi.cmd to proxy.ch_config, try to authenticate less often (#36954) 2016-10-13 09:51:34 -06:00
twangboy
d8e0e0e482 Fix missing comma 2016-10-13 09:36:35 -06:00
Nicole Thomas
5d12c80eda Merge pull request #36956 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-13 09:36:03 -06:00
zer0def
53801c6e80 Mitigates failure reports when making sure an existing supervisor process group is running, despite success. 2016-10-13 16:03:19 +02:00
Nicole Thomas
3ac9ced202 Merge pull request #36241 from hrumph/cert_problem 
Fixes #36240
 2016-10-12 17:28:35 -06:00
twangboy
7b46d04a84 Add note about increased completion times 2016-10-12 17:22:33 -06:00