valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
62,117 Commits 24 Branches 182 Tags 341 MiB
20c980cc23
Commit Graph

62117 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Quan Tong Anh
0049b54240 boto_ec2: support instance_name when attach a network interface 2015-11-18 00:59:55 +07:00
Mark McGuire
7fbb0ac40f add versionadded 2015-11-17 11:55:08 -06:00
Mike Place
d4698e4985 Merge pull request #28936 from skizunov/develop2 
Windows salt-master failures due to passing 'log_queue'
 2015-11-17 10:50:39 -07:00
Mark McGuire
64e01f8e5a don't force utf-8 for configparser serializer 2015-11-17 11:06:55 -06:00
Mark McGuire
f0a60b33e2 Use changes in #28926 2015-11-17 10:54:19 -06:00
Mark McGuire
be2751885d Merge remote-tracking branch 'origin/develop' into configparser-serializer 2015-11-17 10:26:09 -06:00
Justin Findlay
f8ed57cd6d user.present state: rework to use six.string_types 
As suggested by
https://github.com/saltstack/salt/pull/28849/files#r44928354.
 2015-11-17 09:21:40 -07:00
Roman Inflianskas
ded2d46663 [modules/hg] hg.status: multiple repositories 2015-11-17 19:05:57 +03:00
Mike Place
1e9214f4e4 Merge pull request #28787 from chrigl/fix-28784 
closes #28784
 2015-11-17 08:54:04 -07:00
Sergey Kizunov
ebc3b738b6 Passing in log_queue explicitly instead of using **kwargs 
salt/utils/process.py:
- Since `log_queue` is now passed in explicitly, it now may exist with a
value of `None`. `MultiprocessingProcess.__init__` has been modified to
handle this case.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2015-11-17 09:51:39 -06:00
Damian Myerscough
8cd8415652 Missing comma 2015-11-17 07:50:02 -08:00
Mike Place
b387e3c25e Merge pull request #28955 from Michael-S/develop 
Fix index off by one bug in debug log statement.
 2015-11-17 08:47:26 -07:00
Mike Place
5e277492d8 Merge pull request #28939 from quantonganh/boto-ec2-eip 
Boto ec2 eip
 2015-11-17 08:46:49 -07:00
Mike Place
696c44b879 Merge pull request #28811 from quantonganh/boto-ec2-network 
boto_ec2: support subnet_name when creating a network interface
 2015-11-17 08:45:58 -07:00
Mike Place
1e875774ff Merge pull request #28925 from pass-by-value/fx2_firmware_update 
Fx2 firmware update
 2015-11-17 08:43:31 -07:00
Mike Place
d63344575a Merge pull request #28944 from rallytime/dellchassis-state-name-fix 
The ret result must contain 'name', not 'chassis_name' for the state compiler.
 2015-11-17 08:34:21 -07:00
Mike Place
fcef9f8995 Merge pull request #28957 from terminalmage/fix-docstring 
Fix version number for new state option
 2015-11-17 08:33:50 -07:00
Mike Place
5b680c938a Merge pull request #28950 from DSRCompany/pr/28812_which 
PR 28812 which test fix
 2015-11-17 08:32:16 -07:00
Mike Place
73719928f9 Merge pull request #28812 from isbm/isbm-which-decorator-enhancement 
Enhance 'which' decorator reliability
 2015-11-17 08:32:10 -07:00
Erik Johnson
f159000de2 Fix version number for new state option 2015-11-17 09:29:39 -06:00
Mike Place
e3f5e28d67 Merge pull request #28927 from sjorge/state-smartos-fixes 
fix broken smartos state
 2015-11-17 08:22:09 -07:00
Mike Place
facc34efed Merge pull request #28934 from terminalmage/issue27883 
git.latest: Add update_head option to prevent local HEAD from being updated
 2015-11-17 08:15:16 -07:00
Mike Place
7da93aad5b Merge pull request #28937 from rallytime/chassis-doc-fix 
Update dellchassis state example to use correct jinja syntax
 2015-11-17 08:12:28 -07:00
Mike Place
9227a16506 Merge pull request #28931 from cachedout/fix_str_fmt_typo 
Fix typo in str formatting in rpm module
 2015-11-17 08:09:48 -07:00
Mike Place
e273773e24 Merge pull request #28926 from cachedout/serializers_in_states 
Pack serializers into states
 2015-11-17 08:09:33 -07:00
Mike Swierczek
8fae5e61dd Fix index off by one bug in debug log statement. 2015-11-17 09:26:54 -05:00
Dmitry Kuzmenko
18571000c5 Fix which test in PR#28812 2015-11-17 11:29:41 +03:00
rallytime
f3ea01bbfa Make sure dellchassis.blade_idrac has a name arg and a ret['name'] 2015-11-16 21:14:54 -07:00
rallytime
fb718539e9 The ret result must contain 'name', not 'chassis_name' for the state compiler 2015-11-16 20:42:54 -07:00
rallytime
d53713ddba We only need one fancy pillar example to match our state. 2015-11-16 20:08:52 -07:00
Damian Myerscough
af0e58a355 Fixing small typo 2015-11-16 19:03:31 -08:00
Damian Myerscough
2382701def Pass api_url over to the returner 2015-11-16 19:01:15 -08:00
Quan Tong Anh
0fbbb4385d salt.utils: add a docstring for the exactly_one() function 2015-11-17 09:24:54 +07:00
Quan Tong Anh
e6dc6ca479 boto_ec2: support subnet_name when creating a network interface 2015-11-17 09:24:54 +07:00
Quan Tong Anh
b5e3835e83 boto_ec2: add a function to get the first unassociated EIP 2015-11-17 09:20:35 +07:00
Quan Tong Anh
07b9309617 boto_ec2: support network_interface_name when associating an eip addr 2015-11-17 09:20:34 +07:00
rallytime
e2926b1996 Update dellchassis state example to use correct jinja syntax 2015-11-16 16:42:32 -07:00
Sergey Kizunov
ad91491260 Windows salt-master failures due to passing 'log_queue' 
On Windows, there are failures that appear like:
`TypeError: __init__() got an unexpected keyword argument 'log_queue'`

To fix this:

salt/utils/events.py:
- Objects inheriting from
`salt.utils.process.SignalHandlingMultiprocessingProcess` must be
capable of passing the kwarg 'log_queue' through to the parent class
`MultiprocessingProcess` so that it will be used on Windows. See PR
26999 as to why this was needed.

salt/utils/reactor.py:
- Same as event.py
- Moved `__setstate__` and `__getstate__` from `salt.state.Compiler`
to `salt.utils.reactor.Reactor`. The reason is that this is the most
derived class, and we want to accomplish two things:
1) Avoid pickling self.rend (inherited from salt.state.Compiler)
which is unpicklable, hence the need for `__setstate__` and
`__getstate__` in the first place.
2) Initialize the class from the top-most point. The `__init__` function
here will, in turn, initialize parent classes such as
`salt.state.Compiler`, creating the renderer as needed.

salt/state.py:
- Removed `__setstate__` and `__getstate__` from `salt.state.Compiler`
as per comment above.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2015-11-16 17:35:46 -06:00
Erik Johnson
6a35a39ca5 Add update_head option to git.latest 
This option will allow the state to simply fetch and not update the
local HEAD if it differs from the desired remote revision.

Additionally, this commit modifies test=True output so that only changes
to the SHA1 are reported when test=True. This prevents executing
"prereq" requisites for minor changes like the remote URL if they would
not result in changes to the actual content in the local clone.
 2015-11-16 16:43:15 -06:00
Erik Johnson
3787f7ed00 Change return output of git.fetch to a dict 2015-11-16 16:38:19 -06:00
Erik Johnson
9ca0f8f440 Add redirect_stderr argument to cmd.run_all 
This allows cmd.run behavior with stderr redirected, while still
returning the dictionary from cmd.run_all, including the return code.
 2015-11-16 16:36:11 -06:00
Mike Place
bba408e06c Fix typo in str formatting in rpm module 
Introduced by #27521 and causing integration.modules.pkg.PkgModuleTest.test_owner on suse to fail
 2015-11-16 14:39:47 -07:00
Aditya Kulkarni
2ca00ba03d Lint fixes 2015-11-16 14:44:46 -05:00
Jorge Schrauwen
47d1274038 also add versionadded while I am at it 2015-11-16 19:36:18 +00:00
Christoph Glaubitz
8639e3e9c3 closes #28784 
In fact this test will fail on the current code, but that is like
intended. This tests the fix of #28783, which was introduced in 2015.5.
 2015-11-16 20:30:37 +01:00
Jorge Schrauwen
742793d647 add maintener and other info so people can poke me on brokenness 2015-11-16 19:30:24 +00:00
Mike Place
27b917b623 Adjust tests for new loader spec 2015-11-16 12:23:05 -07:00
Jorge Schrauwen
ddb0cd4779 fix brokeness on deep updates in smartos state -> update state config layout... having lists in list... what was I thinking? // also drop step to ensure instances have ids, new config layout takes care of that already. 2015-11-16 19:20:30 +00:00
Mark McGuire
8ade912f50 switch to single quotes 2015-11-16 12:59:04 -06:00
Aditya Kulkarni
8ef807ee45 Support multiple hosts 2015-11-16 13:55:38 -05:00