Mark McGuire
4324189658
add deserializer test, fix deserialization
2015-11-15 14:14:42 -06:00
Mark McGuire
53dd9ae138
Add configparser serializer
...
* move "python" serializer to serializers
* make salt.states.file.serializer load serializers from salt.serializers
2015-11-15 14:04:27 -06:00
Justin Findlay
8edd6ba01c
Merge pull request #28894 from sjorge/continues-quality-improvement
...
small quality improvements for vmadm and imgadm modules
2015-11-14 09:02:52 -07:00
Jorge Schrauwen
eb3acd4000
also make sure we have imgadm for smartos state
2015-11-14 10:25:26 +00:00
Jorge Schrauwen
7a2719ec76
__virtual__() now returns a message for imgadm
2015-11-14 10:21:43 +00:00
Jorge Schrauwen
aec2908348
__virtual__() now returns a message for vmadm
2015-11-14 10:20:39 +00:00
Justin Findlay
84be609010
Merge pull request #28878 from cachedout/ini_fix
...
Fix regression caused by latest ordereddict package
2015-11-13 21:45:52 -07:00
Colton Myers
47c6d4302e
Merge pull request #28879 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2015-11-13 16:10:05 -07:00
Colton Myers
efb479a1bd
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/topics/cloud/vmware.rst
salt/cloud/clouds/vmware.py
salt/grains/chronos.py
salt/grains/marathon.py
salt/loader.py
salt/modules/chronos.py
salt/modules/marathon.py
salt/proxy/chronos.py
salt/proxy/marathon.py
salt/state.py
salt/states/chronos_job.py
salt/states/marathon_app.py
salt/states/user.py
salt/utils/schedule.py
2015-11-13 15:18:45 -07:00
Mike Place
6339d7bfd9
Fix regression caused by latest ordereddict package
...
Fixes ini tests on develop
2015-11-13 14:15:45 -07:00
C. R. Oldham
430e9376f6
Merge pull request #28867 from rallytime/fx2-grains-patch
...
[fx2 grains] Grains functions should return dictionaries
2015-11-13 14:14:13 -07:00
Joseph Hall
3f8f47fda4
Merge pull request #28873 from tehmaspc/tehmaspc_fix_salt_cloud_typo
...
Fix salt-cloud help output typo
2015-11-13 13:39:08 -07:00
Tehmasp Chaudhri
d071747b88
Fix salt-cloud help output typo
2015-11-13 13:35:44 -07:00
Justin Findlay
304072456e
Merge pull request #28863 from mhoogendoorn/fix-issue-28859
...
Fix ebuild.install causing extra refresh_db calls.
2015-11-13 11:46:03 -07:00
rallytime
022cf5d230
[fx2 grains] Grains functions should return dictionaries
2015-11-13 11:15:05 -07:00
Justin Findlay
af297bb0ae
Merge pull request #28865 from jfindlay/2015.8
...
add 2015.8.2 release notes
2015-11-13 10:30:18 -07:00
Justin Findlay
1f847fc9ba
add 2015.8.2 release notes
2015-11-13 10:29:21 -07:00
Colton Myers
38c29fe96f
Merge pull request #28831 from fcrozat/develop
...
Fix deployment when umask is non-standard. Fixes #28830
2015-11-13 10:19:41 -07:00
Mike Place
19d10275a9
Merge pull request #28846 from b225ccc/develop
...
Add password_reset option to salt.states.keystone.user_present
2015-11-13 10:01:36 -07:00
Mike Place
15672a3faa
Merge pull request #28730 from garethgreenaway/27392_2015_8_scheduler_return_job_master
...
Fixes to how return_job is handled in the scheduler for the salt master.
2015-11-13 09:58:20 -07:00
Martijn Hoogendoorn
eca09b89a4
Fix ebuild.install causing extra refresh_db calls.
...
Fixes #28859 .
The original call to `latest_version` caused a `refresh_db` to take
place. This is either unneeded (`refresh=True` was passed to `install`
and so refresh_db was done already) or something we were specifically
asked not to do (`refresh=False` was passed to `install`).
2015-11-13 17:29:14 +01:00
Mike Place
d2c8ef08bc
Merge pull request #28850 from deuscapturus/patch-5
...
Use warn instead of error if decrypt fails
2015-11-13 08:42:20 -07:00
Mike Place
402890ee75
Merge pull request #28855 from tampakrap/sle11sp4_fix_os_grain
...
fix the os grain in sle11sp4 to be SUSE instead of SLES
2015-11-13 08:17:29 -07:00
Nicole Thomas
5560cb662b
Merge pull request #28848 from cro/fx2_multi_creds
...
Lint
2015-11-13 06:46:36 -07:00
Nicole Thomas
7c7a857707
Merge pull request #28851 from rominf/schedule-docs-args-to-job_args
...
[states/schedule] docstring: args, kwargs -> job_args, job_kwargs
2015-11-13 06:44:51 -07:00
Nicole Thomas
595120a758
Merge pull request #28853 from eliasp/patch-2
...
Typo (with → which)
2015-11-13 06:32:48 -07:00
Elias Probst
8b773b75dd
Typo (with → which)
2015-11-13 13:41:24 +01:00
Theo Chatzimichos
5b7207d9b5
fix the os grain in sle11sp4 to be SUSE instead of SLES
...
due to the existence of /etc/os-release on SLE11SP4, the os grain between
SLE11SP3 and SLE11SP4 was different (SLES vs SUSE). Thus, it was falsely trying
to use systemd on SLE11SP4 to start services
2015-11-13 13:25:55 +01:00
Roman Inflianskas
afe82281bb
[states/schedule] docstring: args, kwargs -> job_args, job_kwargs
2015-11-13 10:23:19 +03:00
Brian Talley
7234baf00a
Fix missing closing paren
2015-11-12 19:00:40 -07:00
Theodore Cowan
75e1429860
Use warn instead of error if decrypt fails
...
Error is too strong for this. We have pillars with secrets signed from several keys, which are meant to be deciphered from some salt masters but not others.
2015-11-12 17:26:55 -07:00
C. R. Oldham
f032bffd7c
Lint
2015-11-12 16:26:05 -07:00
Colton Myers
359e7ca209
fix lint
2015-11-12 16:22:36 -07:00
Colton Myers
089828af9e
Merge branch 'cro' into 2015.8
2015-11-12 16:21:26 -07:00
Colton Myers
6bb6703c3e
Merge branch 'fx2_multi_creds' of git://github.com/cro/salt into cro
2015-11-12 16:20:53 -07:00
Brian Talley
c0678dc2d2
Add password_reset option to salt.states.keystone.user_present. This option takes a boolean value. True is the default value to mimic current behavior. If True, user_present will continue to set or reset the password whenever the state runs. If False, user_present will only set the password when the user is first created. This helps the situation where user accounts are created via Salt, but where you don't want to reset the user's password after they've modified it via the OpenStack Horizon web GUI or the OpenStack command line utility.
2015-11-12 16:00:16 -07:00
Mike Place
e71c93b49c
Merge pull request #28840 from sjorge/state-smartos-tweaks
...
some fixes for the new smartos state module
2015-11-12 15:07:50 -07:00
C. R. Oldham
3b7d22248c
Fix fallback credentials, add grains based on dracr.server_info and dracr.inventory, fix short-circuited for loop that was preventing retrieval of most data from CMC and DRAC devices, format responses from racadm more clearly.
2015-11-12 14:50:03 -07:00
Mike Place
778ace3ca5
Merge pull request #28842 from cachedout/tcp_shell_test
...
Add transport setting to shell test
2015-11-12 14:43:11 -07:00
Mike Place
785bf94f55
Add transport setting to shell test
2015-11-12 14:32:39 -07:00
Colton Myers
5639971744
Merge pull request #28837 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-11-12 14:17:14 -07:00
Jorge Schrauwen
b2b373b0cd
removed TODO
2015-11-12 20:38:47 +00:00
Jorge Schrauwen
ba19431c7d
forgot to update some of the docs
2015-11-12 20:35:48 +00:00
Jorge Schrauwen
31b4c37c52
update docs to reflect change
2015-11-12 20:34:07 +00:00
Jorge Schrauwen
d0ed5929a5
fixed some errors found during testing
2015-11-12 20:30:24 +00:00
Colton Myers
1c91ad6765
fix lint
2015-11-12 13:13:39 -07:00
Jorge Schrauwen
a64fdbd595
handle disks property better
2015-11-12 19:55:39 +00:00
Mike Place
c4fb185147
Merge pull request #28827 from jacksontj/2015.8
...
Cleanup virtual_timer in loader
2015-11-12 12:39:29 -07:00
Colton Myers
4b706ac76a
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/troubleshooting/master.rst
2015-11-12 12:33:27 -07:00
Colton Myers
eb904665dc
Merge pull request #28832 from basepi/backport.28826
...
[2015.5] Backport #28826
2015-11-12 12:32:03 -07:00
