Commit Graph

87455 Commits

Author SHA1 Message Date
Matthew Kennerly
ca71d0e7c2
Merge branch 'develop' into bugfix/issue-44423-win-path-prepend 2017-11-07 20:59:32 -05:00
Nicole Thomas
aec80ee1e1
Merge pull request #44353 from prymitive/file-managed-test-changes
File managed test changes
2017-11-07 16:09:09 -07:00
Nicole Thomas
76f3c001ee
Merge pull request #44430 from thatch45/doc_fix1
make it clear that disabling the job cache is bad
2017-11-07 15:53:10 -07:00
Nicole Thomas
8ffe91fe44
Merge pull request #44405 from SEJeff/kubernetes-updates-v2
Kubernetes updates v2
2017-11-07 12:17:43 -07:00
Nicole Thomas
a29eeeec66
Fix a couple of small spelling errors 2017-11-07 12:16:28 -07:00
Nicole Thomas
72434918f4
Merge pull request #44420 from samodid/fix_docstrings_rendering
Fix docstrings rendering errors
2017-11-07 12:13:45 -07:00
Nicole Thomas
9251c43b50
Merge pull request #44428 from bbczeuz/bbczeuz-patch-dockertypos
Fix doc typo in docker_container/read_only
2017-11-07 11:33:48 -07:00
Thomas S Hatch
bed56e9dd7 make it clear that disableing the job cache is bad 2017-11-07 10:14:40 -07:00
Volodymyr Samodid
61abaa6ad5 fix small lint error 2017-11-07 19:14:17 +02:00
Claudius Zingerli
f8148257f9
Fix read_only doc typo
Following the examples, this should be 'rw' instead of 'ro'
2017-11-07 17:11:18 +01:00
Nicole Thomas
58d36631e1
Merge pull request #44421 from orymate/fix-salt-line-doc
fix states.file.line documentation formatting
2017-11-07 08:23:10 -07:00
Nicole Thomas
866ee6faea
Merge branch 'develop' into bugfix/issue-44423-win-path-prepend 2017-11-07 08:17:09 -07:00
Nicole Thomas
40e6d61f16
Merge pull request #44413 from sadminriley/develop
Fixed typo before libs import on common.py
2017-11-07 08:09:46 -07:00
Nicole Thomas
db7be6152f
Merge pull request #44380 from sjorge/zfs_grain_split
Split zfs related grain off into a seperate module
2017-11-07 08:07:36 -07:00
Riley
1c03d93013
Merge branch 'develop' into develop 2017-11-07 08:49:09 -05:00
sadminriley
b884429c8a Merge branch 'develop' of github.com:sadminriley/salt into develop
Conflicts:
	salt/config/schemas/common.py
2017-11-07 08:45:52 -05:00
Riley Louvier
5b65bef44a Fixed typo before libs import 2017-11-07 08:43:33 -05:00
mtkennerly
24e698ec48 Fix #44423: Handle index=None and index=0 distinctly 2017-11-07 06:52:12 -05:00
Mate Ory
840210c6db
file: fix file.line documentation formatting
There were mixed :param:s and simple paragraphs which resulted in a confusing
doc page.
2017-11-07 09:45:47 +01:00
Volodymyr Samodid
4cac95de3e Update states docstring for better auto index description 2017-11-07 10:24:56 +02:00
Volodymyr Samodid
4e3c5075e1 Update modules docstring for better auto index description 2017-11-07 10:24:56 +02:00
Volodymyr Samodid
0c7f63e9d4 fix docstring errors during rendering 2017-11-07 10:24:56 +02:00
Jorge Schrauwen
d15a0f5340 Drop zpool grains from salt.grains.core 2017-11-07 08:19:45 +01:00
Jorge Schrauwen
3af235250d Remove _zpool_data from the bsd_memdata test for grains 2017-11-07 08:17:50 +01:00
Super-User
e124fb81e9 Minor cleanup 2017-11-07 08:17:50 +01:00
Super-User
71b809c4fa Update modules to use the zfs_support grain 2017-11-07 08:17:50 +01:00
Super-User
8a4339f31c Introduce a zfs_support grain
There was some ugly duplicated logic in salt.modules.zfs and
salt.modules.zpool. This got cleaned up and moved inside salt.grain.zfs.

This way the logic gets execute less often and we can simple check for
zfs_support grain in the other locations.
2017-11-07 08:17:50 +01:00
Super-User
a31ef338ef Move zpool grains into salt.grains.zpool 2017-11-07 08:17:50 +01:00
Nicole Thomas
b6079e2b71
Merge pull request #44381 from sjorge/smartos_grain_split
Split SmartOS related grain off into a seperate module
2017-11-06 23:35:35 -07:00
Łukasz Mierzwa
475f0fe3d0
Merge branch 'develop' into file-managed-test-changes 2017-11-06 22:25:10 -08:00
Nicole Thomas
c03e997144
Merge pull request #44246 from nicholasmhughes/add-location-to-file.line-ensure
Add location support to file.line ensure
2017-11-06 22:35:18 -07:00
Riley Louvier
e5bac07e40 Fixed typo before libs import 2017-11-06 12:16:30 -05:00
Mike Place
90a1961289
Merge branch 'develop' into smartos_grain_split 2017-11-06 09:14:31 -07:00
Mike Place
40e0b4cbe2
Merge pull request #44409 from rallytime/stale-config-update
Reduce the number of days an issue is stale by 10
2017-11-06 08:45:35 -07:00
rallytime
1104838aa4
Reduce the number of days an issue is stale by 10 2017-11-05 21:05:40 -07:00
Jeff Schroeder
eaaa4dcf8e
Up the total test coverage of the kubernetes state to 54%!
* Add 100% test coverage for the kubernetes.node_label_absent state
* Add 100% test coverage for the kubernetes.namespace_present state
* Add 100% test coverage for the kubernetes.namespace_absent state
2017-11-05 20:11:25 -06:00
Jeff Schroeder
2b44f7ca85
Small formatting fixup 2017-11-05 20:11:17 -06:00
Jeff Schroeder
c08faa1586
Fix docstring in kubernetes.namespace_present state 2017-11-05 19:30:20 -06:00
Jeff Schroeder
dda5879045
Fix a bug in the kubernetes.namespace_present state
This bug found courtesy of writing unit tests to ensure it worked! When
a namespace is created via `kubernetes.namespace_present`, the 'result'
key of the return dict stays the default of `False`, which is confusing
after it is actually created.

TDD, finding your problems, just like mom!
2017-11-05 19:30:17 -06:00
Jeff Schroeder
7039d74e90
More kubernetes state tests
* Add 100% test coverage for the kubernetes.secret_absent state
* Add 100% coverage for kubernetes.node_label_present
* Also add 'comment' to kubernetes.node_add_label
* Make the faux test objects more believable in test_kubernetes.py
2017-11-05 17:57:29 -06:00
Jeff Schroeder
2b02a46544
Add the beginning of tests for states.kubernetes and update things
* Add 100% test coverage for the kubernetes.secret_present state
* Add 100% test coverage for the kubernetes.configmap_absent state
* Add 100% test coverage for the kubernetes.configmap_present state
* Make some fields optional to kubernetes.create_secret and add examples
* Make some fields optional to kubernetes.replace_secret and add examples
* Make some fields optional to kubernetes.create_configmap and add examples
* Make some fields optional to kubernetes.replace_configmap and add examples
* Add 'comment' when a kubernetes configmap or secret is going to be replaced
* Update 'source', 'template', and 'saltenv' kwargs to defaults from the rest of the codebase
* Allow passing empty 'data' to the kubernetes.configmap_present state to remove the existing contents
2017-11-05 13:34:37 -06:00
Nicole Thomas
87c1666218
Merge branch 'develop' into smartos_grain_split 2017-11-05 09:46:25 -07:00
Jorge Schrauwen
6c0d6b84c5 Merge branch 'smartos_grain_split' of github.com:sjorge/salt into smartos_grain_split 2017-11-03 22:07:32 +01:00
Jorge Schrauwen
8133186366 Split _smartos_zone_data
This commit splits _smartos_zone_data into 3 functions,
- _smartos_zone_data => zoneid, zonename, imageversion
- _smartos_zone_pkgsrc_data => pkgsrc related data for the zone
- _smartos_zone_pkgin_data => pkgin related data for the zone
2017-11-03 22:05:43 +01:00
Mike Place
77e09dabbd
Merge pull request #44372 from whiteinge/slsutil-renderer-uris
Add support for Salt fileserver URIs to slsutil.renderer
2017-11-03 14:44:34 -06:00
Nicole Thomas
91d618b9c5
Merge branch 'develop' into smartos_grain_split 2017-11-03 13:59:24 -06:00
Nicole Thomas
b64f180284
Merge pull request #44388 from alexandruavadanii/fix-debian-uppercase-iface-v2
debian_ip: don't lowercase iface name
2017-11-03 13:52:00 -06:00
Alexandru Avadanii
5382cbe641
debian_ip, rh_ip: Allow uppercase iface routes
PR #39103 ("fixes #31393 don't convert the iface to lower case")
change should also be applied for routes.
Fix both Debian and RHEL IP modules.

Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-11-03 17:33:45 +01:00
Alexandru Avadanii
2fcb08b771
debian_ip: don't lowercase iface name
AArch64, ppc64 and ppc64le have network interfaces with uppercase
characters in their names, e.g. enP5p144s0.

PR #39103 ("fixes #31393 don't convert the iface to lower case")
fixed this issue, but only for RHEL systems. The same change is
required on Debian systems as well.

Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-11-03 17:33:38 +01:00
Mike Place
1412a42f0e
Merge pull request #44070 from gtmanfred/kitchen
begin adding kitchen-salt into the test suite
2017-11-02 15:55:33 -06:00