Commit Graph

51913 Commits

Author SHA1 Message Date
Andrea-Redi Tsarida
4ab9af05d0 RDS exists comment when creating a new instance 2015-04-30 12:05:45 +02:00
Andrea-Redi Tsarida
8f19b765ba Test mode for :
- rds replica_present
- elb register_instances
2015-04-30 10:57:55 +02:00
Thomas S Hatch
ec64dea9c5 Merge pull request #22826 from tsaridas/fix_group_present
Fixes for group present
2015-04-25 11:00:13 -06:00
Thomas S Hatch
9ca2d58b10 Merge pull request #23058 from plastikos/improvement-compound_as_list
[improvement] compound match as list
2015-04-25 10:57:49 -06:00
Thomas S Hatch
0d7eb07456 Merge pull request #22996 from skizunov/develop
Fix Windows salt-master support for RAET
2015-04-25 10:55:58 -06:00
Thomas S Hatch
02ec0381c6 Merge pull request #22923 from lyft/pagerduty_orchestration
Pagerduty orchestration
2015-04-25 10:54:21 -06:00
Thomas S Hatch
671d7a5f86 Merge pull request #22886 from terminalmage/pr-22838
Better solution for PR 22838
2015-04-25 10:54:08 -06:00
Thomas S Hatch
80034e9575 Merge pull request #22858 from isbm/isbm-salt-inspector
Node inspector module(s)
2015-04-25 10:53:56 -06:00
Justin Findlay
edb528d048 Merge pull request #23056 from jakubek/develop
print option mode presented in human friendly way
2015-04-25 10:07:24 -06:00
Andrea-Redi Tsarida
53b76f233d - fix comments 2015-04-25 15:16:11 +02:00
Andrea-Redi Tsarida
3ac4133405 - option to add policies for user_present state 2015-04-25 14:37:04 +02:00
Jakub Mrozinski
7e82e3247e fixed comparison 2015-04-25 08:06:34 +02:00
Joseph Hall
480bd2cd2b Merge pull request #23033 from nmadhok/vmware-cloud-driver
Additions to VMware salt-cloud driver
2015-04-24 21:01:05 -06:00
Thayne Harbaugh
6f4cfd01fc Specify compound matches as lists
Compound matches, such as nodegroups, can now be specified as lists.  This
avoids splitting on whitespace which may be part of a key or value.

Right now this only works for nodegroups.  Making the argument to "-C"
(compound list) a JSON argument is a future task.
2015-04-24 17:00:04 -06:00
Jakub Mrozinski
4fb5ab336e print option mode presented in human readable value 2015-04-25 00:20:33 +02:00
Ryan Lane
ce8993f0c7 Fix a couple docstrings 2015-04-24 14:54:33 -07:00
Andrea-Redi Tsarida
b77310d9fd - remove option to add user to group from user_present 2015-04-24 22:33:28 +02:00
Nitin Madhok
440378a010 Doc fix 2015-04-24 15:57:09 -04:00
Justin Findlay
6efef05d27 Merge pull request #23036 from jfindlay/merge_23017
adding states/boto_elasticache unit test
2015-04-24 13:47:27 -06:00
Justin Findlay
cbfcc07840 Merge pull request #23037 from jfindlay/merge_23018
adding states/boto_elb unit test
2015-04-24 13:47:18 -06:00
Nitin Madhok
48867032fd Fixing code-blocks 2015-04-24 15:39:45 -04:00
Nitin Madhok
ced82c2f09 Fixing lint and adding more checks to _upg_tools_helper 2015-04-24 15:31:17 -04:00
Thayne Harbaugh
4adcf1c6f9 Correct referencing delimiter 2015-04-24 13:18:33 -06:00
Bruce Sherrod
16e41c7511 lint 2015-04-24 11:31:50 -07:00
Jayesh Kariya
06979ca744 adding states/boto_elb unit test 2015-04-24 12:07:41 -06:00
Jayesh Kariya
eda40c4b33 adding states/boto_elasticache unit test 2015-04-24 12:05:24 -06:00
Nitin Madhok
73a6bb35ff Removing redundant dictionary key 2015-04-24 13:49:30 -04:00
Nitin Madhok
b4777e0a1d refactors to match the standards 2015-04-24 13:47:43 -04:00
Nitin Madhok
d89c6096d6 Adding list_clusters_by_datacenter() 2015-04-24 13:29:12 -04:00
Nitin Madhok
ed2a2a5aec Refactoring list_hosts_by_cluster() and list_hosts_by_datacenter() 2015-04-24 13:28:40 -04:00
Justin Findlay
a74ae78efe Merge pull request #23030 from basepi/merge-forward-develop
Merge forward from 2015.2 to develop
2015-04-24 11:23:27 -06:00
Thayne Harbaugh
5abd3a7fb8 Correct undefined variable. 2015-04-24 11:02:51 -06:00
Colton Myers
313c46501d Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/auth/pam.py
    salt/modules/boto_route53.py
    salt/state.py
2015-04-24 10:19:03 -06:00
Sergey Kizunov
f21881a3a0 Fix Windows salt-master support for RAET
The following changes were required:

salt/config.py:
- RAET on Windows uses 'win32file.CreateMailslot()' for IPC. Due to
this, sock_dirs must start with '\\.\mailslot\' and not contain any
colons. We don't expect the user to know this, so we will fix up their
path for them if it isn't compliant.

salt/daemons/flo/core.py:
- On Windows, RAET IPC (aka lanes) use mailboxes. This is name based
and not file backed. Due to this, SaltRaetCleanup() does not need to
delete any files.

salt/daemons/flo/jobber.py:
- SaltRaetNixJobber is not picklable. Pickling is necessary when
spawning a process in Windows. Since the process will be spawned and
joined on non-Windows platforms, instead of this, just run the function
directly and absorb any thrown exceptions.

salt/daemons/flo/reactor.py:
- In this context, 'self.proc_mgr.add_process' is invalid. Instead,
'self.proc_mgr.value.add_process' should be used. This seems to be a
bug in every OS.

salt/utils/raetevent.py:
- On Windows, 'transport.jobber_stack' doesn't exist when
__prep_stack() is invoked. Add a 'hasattr' check to avoid an exception.

salt/utils/reactor.py
- The event object created in the Reactor object seems to always be a
ZeroMQ event, even when transport is 'raet'. This is fixed. This seems
to be a bug in every OS.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2015-04-24 11:08:05 -05:00
Nitin Madhok
c4734f6c01 Merge pull request #7 from mpmoers/vmware-cloud-driver
Added function list_hosts_by_cluster()
2015-04-24 11:51:04 -04:00
Nitin Madhok
79a0cbad4f Merge branch 'develop' of https://github.com/saltstack/salt into vmware-cloud-driver 2015-04-24 11:49:04 -04:00
Justin Findlay
d5a4173478 Merge pull request #23024 from The-Loeki/patch-1
minion nodes should parse minion configs
2015-04-24 09:34:17 -06:00
Ronald van Zantvoort
96af032908 minion nodes should parse minion configs
Small copy/paste typo there
2015-04-24 16:55:19 +02:00
Justin Findlay
f9bdf6347d Merge pull request #23019 from jayeshka/boto_iam_role-states-unit-test
adding states/boto_iam_role unit test case
2015-04-24 08:42:51 -06:00
Justin Findlay
588579b124 Merge pull request #23020 from jayeshka/raet_publish-unit-test
adding raet_publish unit test case
2015-04-24 08:42:20 -06:00
Justin Findlay
24d2c6f501 Merge pull request #23011 from plastikos/improvement-leading_not
Add a versionadded note for the leading "not"
2015-04-24 08:11:34 -06:00
Jayesh Kariya
49894795ad adding raet_publish unit test case 2015-04-24 17:30:24 +05:30
Jayesh Kariya
93214d0441 adding states/boto_iam_role unit test case 2015-04-24 17:21:28 +05:30
Thayne Harbaugh
993373655a Allow grain and pillar delimiter to be specified in compound matcher syntax. 2015-04-23 23:26:49 -06:00
Thayne Harbaugh
bbd063fdee Add a versionadded note for the leading "not" 2015-04-23 22:27:10 -06:00
Thomas S Hatch
4d57a2d7c0 Merge pull request #22962 from cachedout/remove_gitpillar_update
Remove update() in git pillar
2015-04-23 21:45:54 -06:00
Thomas S Hatch
9a1a55850a Merge pull request #22963 from garethgreenaway/verify_schedule_functions_with_events
Additions to schedule module
2015-04-23 21:45:25 -06:00
Thomas S Hatch
de24ecfc90 Merge pull request #22966 from techhat/stormpathup
Updates to Stormpath as per @rdegges
2015-04-23 21:44:58 -06:00
Thomas S Hatch
57999117f2 Merge pull request #22969 from plastikos/improvement-leading_not
Allow compound expressions to begin with "not"
2015-04-23 21:44:45 -06:00
Thomas S Hatch
e33e3c130e Merge pull request #22998 from techhat/restsdb
Add REST driver for SDB
2015-04-23 21:43:15 -06:00