Commit Graph

92038 Commits

Author SHA1 Message Date
rallytime
8ded32b84a
Remove deprecated monggodb_database state
All functions in the mongobd_database state was deprecated and marked for
removal in the Fluorine release. Since no functions would remain in the state,
the state has been removed.
2018-03-13 13:49:20 -04:00
rallytime
2e3bc07cf2
Remove deprecated mongodb_user state
All functions in the mongobd_user state were deprecated and marked for removal
in the Fluorine release. Since no functions would remain in the state, the
state has been removed.
2018-03-13 13:43:10 -04:00
Nicole Thomas
596ee49e1d
Merge pull request #46500 from rallytime/fix-46476
Remove deprecated k8s state
2018-03-13 13:07:34 -04:00
Nicole Thomas
630c27b8e9
Merge branch 'develop' into add-dict-mode-to-pillar_ldap 2018-03-13 11:30:57 -04:00
rallytime
aa760334a1
Merge branch '2018.3.0rc1' into '2018.3'
No conflicts.
2018-03-13 10:58:28 -04:00
Nicole Thomas
0285875edc
Merge pull request #46501 from twangboy/win_fix_grains
Remove ConvertTo-JSON on Win 7 / 2008R2 and lower
2018-03-13 10:33:39 -04:00
Nicole Thomas
3e073c7e8a
Merge pull request #46502 from terminalmage/issue43208
user.present: don't change uid/gid unless explicitly told to
2018-03-13 10:25:19 -04:00
Nicole Thomas
0ab5013c16
Merge pull request #46403 from MaxBosse/develop
Add env-support to composer modules/states
2018-03-13 10:06:07 -04:00
Erik Johnson
4106840deb
user.present: don't change uid/gid unless explicitly told to
Prior to this change, this state would update the uid/gid. This change
may have been accidental, and can cause problems with file ownership. A
uid/gid change must now be explicitly requested via two new arguments to
the `user.present` state.
2018-03-12 19:30:47 -05:00
twangboy
16f7d44aae
Remove ConvertTo-JSON on Win 7 / 2008R2 and lower 2018-03-12 17:50:03 -06:00
Nicole Thomas
70af79cc30
Merge pull request #46423 from moench-tegeder/dns_check_sockaddr_cleanup
cleanup getaddrinfo() usage in dns_check()
2018-03-12 17:29:21 -04:00
Nicole Thomas
bcf8436499
Merge pull request #46244 from mcalmer/k8s-with-kubeconfig
Kubernetes configured via kubeconfig
2018-03-12 17:27:52 -04:00
Nicole Thomas
c83e539d9d
Merge pull request #46497 from terminalmage/issue46207-2018.3.0rc1
salt-call: don't re-use initial pillar if CLI overrides passed (2018.3.0rc1)
2018-03-12 17:27:12 -04:00
rallytime
cf44199305
Remove deprecated k8s state
All functions in the k8s state were deprecated and marked for removal in the
Fluorine release. Since now functions would remain in the state, the state
has been removed.

Fixes #46476
2018-03-12 17:22:04 -04:00
rallytime
05939e5445
Remove deprecated syntax for "profile" in vault pillar
Fixes #46475
2018-03-12 17:12:57 -04:00
Nicole Thomas
affd7c5716
Merge branch 'develop' into develop 2018-03-12 16:41:20 -04:00
Nicole Thomas
b3c8537f93
Merge pull request #46495 from rallytime/fix-46474
Remove deprecated syntax for roster_order in roster/cache.py
2018-03-12 16:27:53 -04:00
Nicole Thomas
889293cf37
Merge pull request #46494 from rallytime/merge-develop
[develop] Merge forward from 2018.3 to develop
2018-03-12 16:26:43 -04:00
Nicole Thomas
7cdb00ca9c
Merge pull request #46398 from rallytime/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
2018-03-12 16:25:18 -04:00
Nicole Thomas
f5abf1bc95
Merge pull request #46155 from kojiromike/kms-renderer
Add a KMS Envelope-Encryption Renderer
2018-03-12 14:42:22 -04:00
Erik Johnson
8eb721db44
salt-call: don't re-use initial pillar if CLI overrides passed
A salt-call run already compiles pillar before executing the specified
function. Therefore, a performance improvement was made to re-use that
initial pillar data when running states. However, when we just re-use
that pillar data, we lose the ability to have custom external pillar
modules gain access to CLI pillar overrides. Therefore, this commit
changes the code in the state compiler which gathers/re-uses the pillar
data so that it only re-uses the existing in-memory pillar data when no
CLI pillar overrides were passed.
2018-03-12 13:26:13 -05:00
Gareth J. Greenaway
bd66916a4c
Merge branch 'develop' into dns_check_sockaddr_cleanup 2018-03-12 10:41:38 -07:00
rallytime
194c9c12e9
Remove deprecated syntax for roster_order in roster/cache.py
Fixes #46474
2018-03-12 13:23:31 -04:00
rallytime
ddd1f39578
Update old utils paths to new utils paths 2018-03-12 13:03:04 -04:00
rallytime
651dcaff66
Merge branch '2018.3' into 'develop'
Conflicts:
  - tests/integration/states/test_file.py
2018-03-12 11:53:21 -04:00
Nicole Thomas
6866f37710
Merge pull request #46491 from nicholasmhughes/add-salt-keys-to-userdata
Add the ability to send Salt minion keys to the userdata script
2018-03-12 11:13:44 -04:00
Nicole Thomas
a1edb0fe4e
Merge pull request #46489 from mkuron/patch-1
iptables cgroup support
2018-03-12 10:35:52 -04:00
nicholasmhughes
f82367289e
added the ability to send salt keys to the userdata script 2018-03-12 09:11:37 -04:00
Michael Kuron
21ed71cee4
iptables cgroup support 2018-03-12 12:11:51 +01:00
Michael Calmer
7e39a95b82 provide valid config for unit tests 2018-03-11 11:28:55 +01:00
Michael Calmer
08a3dcf9ee template must not be None 2018-03-11 11:28:55 +01:00
Michael Calmer
572d54330b Get old style configuration back until Sodium release 2018-03-11 11:28:55 +01:00
Michael Calmer
af8a665164 enhance warning about configuration option change 2018-03-11 11:28:55 +01:00
Michael Calmer
f96e2f4459 pylint 2018-03-11 11:28:55 +01:00
Michael Calmer
ebf5ddd75e fix typos 2018-03-11 11:28:54 +01:00
Michael Calmer
6a3983e524 log error when removing of kubeconfig file failed 2018-03-11 11:28:54 +01:00
Michael Calmer
db91ed06ee extract settings function in unit tests 2018-03-11 11:28:54 +01:00
Michael Calmer
453b3d26a6 simplify connection setup logic 2018-03-11 11:28:54 +01:00
Michael Calmer
46f88d5f50 add warning about configuration options changed 2018-03-11 11:28:54 +01:00
Michael Calmer
14a2429475 fix typo in description 2018-03-11 11:28:54 +01:00
Michael Calmer
f191b06ac8 adapt unit tests 2018-03-11 11:28:54 +01:00
Michael Calmer
e687aad661 change kubernetes access configuration to provide full kubeconfig instead of single values
Initializing kubernetes client using kubeconfig is future-proof because
a lot of new auth methods were added recently and maybe added in future.
2018-03-11 11:28:54 +01:00
Mike Place
ce86ddd754
Merge pull request #46466 from rallytime/stale-config-update
Reduce the number of days an issue is stale by 10
2018-03-10 16:56:19 -08:00
Michael A. Smith
13cc08d67c
AWSKMS Decrypt: Fix PY3 Bytestring Errors 2018-03-10 16:49:50 -05:00
Michael A. Smith
8f27f93bd9
AWSKMS Decrypt: Unused Import 2018-03-10 16:49:33 -05:00
Michael A. Smith
f9793a3d52
AWSKMS Decrypt: Refactor for AWS Profile Support 2018-03-10 16:49:32 -05:00
Michael A. Smith
909f09c666
Add a KMS Envelope-Encryption Renderer 2018-03-10 16:49:31 -05:00
rongzeng
a541fb5de8
Merge branch 'develop' into fix_for_minion_conf 2018-03-11 01:23:03 +08:00
denza
f62aab3bbb Allow a customer to set public and private IP addresses 2018-03-10 09:31:43 +01:00
rallytime
bbd566a52b
Reduce the number of days an issue is stale by 10 2018-03-09 16:00:01 -05:00