Commit Graph

87625 Commits

Author SHA1 Message Date
Eric Radman
93b44abd6c Implement swap_total grain on OpenBSD
Total swap is not reported by sysctl(8) on OpenBSD. Use swapctl(8) instead.

Signed-off-by: Eric Radman <ericshane@eradman.com>
2017-11-06 12:28:44 -05: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
rallytime
f26beffe48
Update old utils paths to new paths 2017-11-05 20:39:40 -07:00
rallytime
2c052e34b3
Merge branch '2017.7' into 'develop'
Conflicts:
  - .gitignore
  - salt/modules/win_lgpo.py
  - salt/utils/__init__.py
  - tests/integration/spm/test_build.py
  - tests/unit/test_pydsl.py
2017-11-05 20:28:51 -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
Mike Place
b11da0d2da
Merge pull request #44358 from The-Loeki/kube-client-cert-file
Kubernetes client certificate file usage fix
2017-11-03 15:51:27 -06:00
Mike Place
1974e52c06
Merge pull request #44347 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-11-03 15:48:20 -06: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
Jorge Schrauwen
73def53527 Also make available info about the type of vms 2017-11-02 12:31:38 +01:00
Jorge Schrauwen
d545adc95c Moved SmartOS grains to salt.grains.smartos
For the computenode data 3 exec's were condensed into one, execs are
expensive.
2017-11-02 12:14:59 +01:00
Super-User
51ee3c61cd Remove smartos specific grains from core
This allows the removal of the json module dependancy
NOTE: Not sure how the override of some unavailable smbios grains will
work when they are done in a seperate module. TIAS
2017-11-02 11:21:00 +01:00
Seth House
abac05fb11
Add support for Salt fileserver URIs to slsutil.renderer 2017-11-01 12:38:20 -06:00
Mircea Ulinic
40fdaa6acc
Tag changes for Oxygen 2017-11-01 17:59:37 +00:00
Mircea Ulinic
121c4eef7c
Improve the http_logstash engine
At the time being, this engine considers only the events
starting with salt/job. That was a poor design decision,
as the user may have other interesting events on the Salt bus,
that don't necessarily belong to the Salt standard events.
Moreover, this was not in-line with the other TCP/UDP Logstash engine
https://github.com/saltstack/salt/blob/2017.7/salt/engines/logstash.py#L76

I also improved a little the documentation.
2017-11-01 17:58:23 +00:00
Nicole Thomas
aea9f4a115
Merge pull request #44364 from Ch3LL/fix_size_test
Include disk size check for test_spm_build_big_file test
2017-11-01 09:57:24 -04:00
Ch3LL
952c6bfea4
Include file size check for test_spm_build_big_file test 2017-10-31 18:18:37 -04:00
skjaro
21eef64116 Fix lint violation 2017-10-31 20:07:16 +01:00
Mike Place
c46490c183
Merge pull request #44190 from prymitive/postgres_extension
Fix test=true checks so that state runs in test mode don't report cha…
2017-10-31 11:53:06 -06:00
Mike Place
57705b9e6a
Merge pull request #44231 from SEJeff/kubernetes-stuff
Kubernetes module updates round one
2017-10-31 11:21:28 -06:00
Mike Place
609de9367a
Merge pull request #44273 from DSRCorporation/bugs/44239_syndic_progress
Workaround progressbar failure if minion is behind syndic.
2017-10-31 11:07:16 -06:00
Mike Place
06afbe4214
Merge pull request #44275 from rallytime/arch-doc
Doc updates for architecture.rst file
2017-10-31 10:49:41 -06:00
Mike Place
d9a4cc22da
Merge pull request #44328 from rallytime/doc-fixes
Add some clarifications to event and architecture documentation
2017-10-31 10:21:37 -06:00
Mike Place
e7bf7b6b98
Merge pull request #44359 from gtmanfred/develop
add saltstack community slack to the readme
2017-10-31 10:15:08 -06:00
Daniel Wallace
62c0cf70d4
Merge branch 'develop' into develop 2017-10-31 10:14:04 -06:00
Daniel Wallace
90a997ecc2
add saltstack community slack to the readme 2017-10-31 10:11:01 -06:00
Daniel Wallace
1dccaae707
fix pylint 2017-10-31 10:08:09 -06:00
Ronald van Zantvoort
35a8b0bb38 Kubernetes client certificate file usage fix 2017-10-31 15:54:24 +01:00
Łukasz Mierzwa
98c61ae22e
Don't populate changes key in dry-run mode
If dry-run mode is active (test=true) only pchanges should be populated otherwise change is reported twice
2017-10-30 23:03:55 -07:00
Łukasz Mierzwa
415d05c66c
Use pchanges in highstate output module if changes key is empty and pchanges is present
As per discussion in https://github.com/saltstack/salt/issues/40208 pchanges should be used for dry-run, it requires proper handling in the output module to correctly report changes to the user
2017-10-30 23:03:54 -07:00
Nicole Thomas
af1b460c6d
Merge pull request #43703 from rallytime/publish_refactor_use_check_authentication
Refactor publish func in master/masterapi to use check_authentication
2017-10-30 17:32:14 -04:00
Nicole Thomas
eef6dbfa58
Merge pull request #44350 from gtmanfred/2017.7
update salt-jenkins repo to 2017.7
2017-10-30 17:31:29 -04:00
Daniel Wallace
cf71e3d9f2
update salt-jenkins repo to 2017.7 2017-10-30 15:29:00 -06:00
rallytime
9bad04b94b
Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/modules/archive.py
2017-10-30 17:05:02 -04:00
Nicole Thomas
4e6f09e3eb
Merge pull request #44345 from gtmanfred/2016kitchen
remove binding from erb template rendering
2017-10-30 16:57:43 -04:00