Nicole Thomas
dcfdbf189d
Merge pull request #23249 from lyft/boto-iam-assume-role-support
...
Support for assumed role policies and roles without instance profiles
2015-05-05 09:20:15 -06:00
Mike Place
6291d5a41f
Merge pull request #23351 from jfindlay/salt_url
...
salt url handling utils
2015-05-05 08:11:22 -06:00
Mike Place
f78fa26fb8
Merge pull request #23357 from lyft/add-missing-docs
...
Add missing pagerduty and boto docs
2015-05-05 08:10:25 -06:00
Mike Place
5f29e4b29f
Merge pull request #23366 from skizunov/develop2
...
Remove unused code
2015-05-05 08:09:51 -06:00
Sergey Kizunov
938bb4f5a0
Remove unused code
...
salt/master.py:
- The run_reqserver() function was moved from being defined within a
class method to being its own class method. This was to facilitate
pickling on Windows. At that time, the old version was removed.
However, the old version found its way back into the code, even
though it is not used or referenced. Note that 'self.run_reqserver'
references the new, class method version.
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2015-05-05 07:55:02 -05:00
Ryan Lane
f03c68655c
Add missing pagerduty and boto docs
2015-05-04 23:31:26 -07:00
Ryan Lane
538f8f033b
Fix lint error
2015-05-04 23:03:58 -07:00
Justin Findlay
9ea2f477b9
more than ZMQ supported for transport, other typos
2015-05-04 23:24:46 -06:00
Justin Findlay
b4629d4373
remove unused function in the file state
2015-05-04 23:24:46 -06:00
Justin Findlay
11d893db19
explicitly quote requirements filename
2015-05-04 23:24:46 -06:00
Justin Findlay
29a023aaad
better path query parsing in fileserver
2015-05-04 23:24:45 -06:00
Justin Findlay
2c3f82bd92
also handle salt://| escaping in fileclient
2015-05-04 23:24:45 -06:00
Justin Findlay
e0ab1e9d9d
always override global saltenv with url saltenv
2015-05-04 23:24:45 -06:00
Justin Findlay
db0f85a882
quote source file name in file mod error messages
2015-05-04 23:24:45 -06:00
Justin Findlay
f58f3dac1d
integration test for char escaping in file paths
2015-05-04 23:24:45 -06:00
Justin Findlay
336a48eca8
add salt.utils.url unit tests
2015-05-04 23:24:45 -06:00
Justin Findlay
3a9c5afea1
collect additional url utils
2015-05-04 23:24:45 -06:00
Justin Findlay
b23791716d
create and parse salt:// URLs with url util
2015-05-04 23:24:45 -06:00
Justin Findlay
1b786d0692
replace env_splitter construct with urllib utils
2015-05-04 23:24:45 -06:00
Justin Findlay
cc8ecee621
add salt:// URL utils
2015-05-04 23:24:45 -06:00
Justin Findlay
221f6e5135
Merge pull request #23354 from plastikos/improvement-grain_pcre
...
Add a short argument (-P) for --grain-pcre
2015-05-04 22:02:29 -06:00
Ryan Lane
a0ee7cb225
Fix unit tests and add coverage for new functions.
2015-05-04 19:31:59 -07:00
Thayne Harbaugh
51f3252bda
Add a short argument (-P) for --grain-pcre
...
The compound matcher uses P@ for grain-pcre matches. Currently -P is
only used for salt-key and salt cloud cli parsers so "-P" should not
collide with another option.
2015-05-04 20:13:37 -06:00
Ryan Lane
ca44c8cf08
Add missing docstrings
2015-05-04 17:30:28 -07:00
Nicole Thomas
69333f4af5
Merge pull request #23345 from nmadhok/vmware-cloud-driver
...
Adding ability to change type of existing network adapter if specified during create()
2015-05-04 17:15:26 -06:00
Thomas S Hatch
006b522369
Merge pull request #23333 from skizunov/develop2
...
Fix salt-call using RAET on Windows
2015-05-04 14:58:50 -06:00
Nitin Madhok
edcad4bcee
Adding ability to change type of existing network adapter if specified
2015-05-04 16:58:14 -04:00
Thomas S Hatch
988e73fa06
Merge pull request #23314 from nmadhok/vmware-cloud-driver
...
Better error handling in vmware cloud driver create()
2015-05-04 14:57:35 -06:00
Thomas S Hatch
e23e4f6ef8
Merge pull request #23309 from rmcleay/secgroup_egress
...
Egress rule support for boto_secgroup
2015-05-04 14:57:02 -06:00
Sergey Kizunov
b0e7f590b5
Fix salt-call using RAET on Windows
...
salt/cli/caller.py:
- Avoid picking RAETCaller on Windows. Since no state from RAETCaller
is needed in the spawned child process, simply moved the child process
entry function outside of RAETCaller.
- Added Windows specific logic to detect if the lane is set up. We need
to use win32file.CreateFile for detection since Windows lanes don't use
regular files.
salt/transport/raet.py:
- Fixed obvious bugs that would cause this functionality to not work in
any OS.
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2015-05-04 12:02:37 -05:00
Justin Findlay
b224d823eb
Merge pull request #23308 from thusoy/patch-2
...
Don't merge: Add missing jump arguments to iptables module
2015-05-04 09:09:15 -06:00
Justin Findlay
55e2185b02
Merge pull request #23328 from s0undt3ch/develop
...
Py3 fix & unrelated .pylint fix
2015-05-04 09:08:46 -06:00
Justin Findlay
83b62b47d9
Merge pull request #23322 from thusoy/patch-3
...
Silence iptables checks
2015-05-04 09:00:12 -06:00
Pedro Algarvio
c4bba0ca3a
Python 3 fix
2015-05-04 15:26:05 +01:00
Pedro Algarvio
171e022331
Start checking code to enforce a minimum python version support
2015-05-04 15:25:38 +01:00
Tarjei Husøy
275147d131
Silence iptables checks
...
Prevents error logging for every iptables run.
2015-05-04 13:34:31 +02:00
Tarjei Husøy
64f661d2cc
Add missing jump arguments to iptables module
...
I think this is all the arguments supported.
Also adds test for no-arg options and adds some docs on no-arg.
Point to discuss:
- The --save option crashes with our defined --save option. Probably
no rush since no one's complained so far, but this should be fixed.
Maybe we can rename this one to connsecmark-save, since it only appears
as an option to the CONNSECMARK jump target? Maybe also rename restore
to connsecmark-restore too, for consistency, even though restore
doesn't collide with anything?
2015-05-04 13:19:23 +02:00
Nitin Madhok
daf5ab263d
Error checking and better debug messages
2015-05-04 06:14:09 -04:00
Nitin Madhok
cd3ba1ee2b
Syntax fix
2015-05-04 05:55:14 -04:00
Nitin Madhok
8a9e9eeb03
Better error checking
2015-05-04 05:23:08 -04:00
Nitin Madhok
ace1d58947
Make sure exception raises is of type Exception() Fixes #23312
2015-05-04 03:39:22 -04:00
Robert McLeay
57067a3c0f
Fixing linting in boto_secgroup module and unit test.
2015-05-04 15:45:26 +10:00
Robert McLeay
78e22e6d38
Fixed 'all' protocol case for boto_secgroup state.
2015-05-04 15:45:26 +10:00
Robert McLeay
0361d39342
Added rules_egress docs for boto_secgroup state.
2015-05-04 15:45:26 +10:00
Robert McLeay
c2695986fe
Added rules_egress to boto_secgroup unit test.
2015-05-04 15:45:25 +10:00
Robert McLeay
ce3fb4ba70
Added initial states.boto_secgroup support for egress rules.
2015-05-04 15:45:25 +10:00
Robert McLeay
59fc64fc7a
Added initial module.boto_secgroup support for egress rules.
2015-05-04 15:45:13 +10:00
Nicole Thomas
c85094df5d
Merge pull request #23305 from farcaller/typo
...
Fixed a Runenr typo in the docs
2015-05-03 14:43:27 -06:00
Nicole Thomas
a624abddae
Merge pull request #23306 from nmadhok/vmware-cloud-driver
...
VMware cloud driver doc fixes
2015-05-03 14:42:17 -06:00
Nitin Madhok
49f5789934
VMware cloud driver doc fixes
2015-05-03 16:14:07 -04:00