Fred Reimer
f17953514b
Import boto in a try/except block in case it is not available on the master
2015-03-01 20:21:53 -05:00
Fred Reimer
30735e0929
Fixup pylint errors
2015-03-01 19:46:03 -05:00
Fred Reimer
6007685389
Added ec2_pillar external pillar.
...
This pillar module queries AWS EC2 for instances. The minion-id must be set to
the instance-id, or alternatively a grain named instance-id can be set to hold
this data. Since grains are inherently insecure, a list of minion-ids which are
trusted can be specified. In that case, only those minions can use their grain
to specify the instance-id.
2015-03-01 19:22:32 -05:00
Thomas S Hatch
8e8168425c
Merge pull request #21177 from thatch45/inotify_add
...
Inotify add
2015-03-01 12:53:37 -07:00
Thomas S Hatch
f34f7f96bd
change from rec to recurse
2015-03-01 12:13:52 -07:00
Nicole Thomas
b74ab7e726
Merge pull request #21183 from UtahDave/2015.2local
...
convert datetime objects to strings
2015-03-01 09:42:47 -07:00
David Boucha
1993307053
convert datetime objects to strings
...
so msgpack doesn't blow up
2015-03-01 04:25:20 -07:00
Thomas S Hatch
5c1a8d4e8e
lint
2015-02-28 19:16:39 -07:00
Thomas S Hatch
35739abdfd
Merge pull request #21175 from UtahDave/cherry-pick-twilio-beacon
...
Cherry pick twilio beacon from develop to 2015.2
2015-02-28 19:15:50 -07:00
Joseph Hall
f345ed8f58
Merge pull request #21170 from freimer/issue_21167
...
Issue 21167
2015-02-28 18:35:04 -07:00
Pedro Algarvio
01daca44b8
Merge pull request #21174 from thatch45/2015.2
...
Add config doc for wtmp beacon
2015-03-01 00:59:20 +00:00
David Boucha
99a7766c34
fix code block formatting
2015-02-28 17:49:30 -07:00
Thomas S Hatch
91fc12b424
Add mask lookups by name and docs
2015-02-28 17:37:26 -07:00
David Boucha
0e3f2a851b
fix pylint issue.
2015-02-28 17:11:46 -07:00
David Boucha
9710af9d9e
Add Twilio text message beacon
...
This beacon will poll a Twilio account for text messages
and emit an event on Salt's event bus as texts are received.
2015-02-28 17:11:14 -07:00
Thomas S Hatch
e6087342a3
Add config doc for wtmp beacon
2015-02-28 17:05:39 -07:00
Fred Reimer
6fa85604a3
Add small delay between stopping and starting minion service
2015-02-28 18:55:32 -05:00
Fred Reimer
ada32e4768
Quoted username and password for winexe, because they may contain special characters and were failing
2015-02-28 17:47:56 -05:00
Fred Reimer
854e6fe67b
Changed name of retry_delay parameter
2015-02-28 17:20:02 -05:00
Fred Reimer
93a8673349
Merge remote-tracking branch 'upstream/2015.2' into issue_21167
2015-02-28 17:08:56 -05:00
Fred Reimer
883e4d1d1a
Added win_deploy_auth_retries and win_deploy_auth_retry_delay for ec2 cloud
2015-02-28 17:08:44 -05:00
jfindlay
6a3015f86c
Merge pull request #21165 from s0undt3ch/2015.2
...
Py3 compat and remove unused imports
2015-02-28 14:47:12 -07:00
jfindlay
30a66f78a6
Merge pull request #21164 from s0undt3ch/hotfix/extra-kwargs-ignores
...
Add `fun` and `state` to the runtime internal keywords listing
2015-02-28 14:46:06 -07:00
jfindlay
319ca4c470
Merge pull request #21161 from s0undt3ch/hotfix/add-warn-until
...
Let's not forget to remove the log message
2015-02-28 14:42:38 -07:00
Pedro Algarvio
051f3c3d3c
Py3 compat and remove unused imports
2015-02-28 19:54:14 +00:00
Pedro Algarvio
30322e2d84
Add fun and state to the runtime internal keywords listing
...
Fixes #21120
Refs #21133
Refs https://github.com/saltstack/salt/issues/18806#issuecomment-76532356
2015-02-28 19:42:16 +00:00
Pedro Algarvio
ea5317f2e0
Let's not forget to remove the log message
2015-02-28 19:23:09 +00:00
Erik Johnson
5573b18624
Fix more py3-incompatible print statements
2015-02-28 12:15:16 -06:00
Erik Johnson
93e1805c14
Lint fix
2015-02-28 12:13:41 -06:00
Erik Johnson
84de5b23af
Merge pull request #21160 from terminalmage/lint-2015.2
...
Don't use print statement without parenthesis (py3 compat)
2015-02-28 11:49:13 -06:00
Erik Johnson
afb8439c1f
update test_valid_docs
2015-02-28 11:47:12 -06:00
Erik Johnson
86937eedc4
Don't use print statement without parenthesis (py3 compat)
...
This backports a lint fix from #21158 into the tests for 2015.2.
2015-02-28 11:41:51 -06:00
Erik Johnson
465c729611
Merge pull request #21156 from terminalmage/container-resource
...
Split out _run() func into container_resource.py
2015-02-28 10:32:51 -06:00
Erik Johnson
0f2bc036d4
Split out _run() func into container_resource.py
...
This is in preparation for nspawn re-using this same code in a future
release.
2015-02-28 10:29:22 -06:00
Erik Johnson
5b83b5e9a4
Add salt.modules.container_resource
2015-02-28 10:29:21 -06:00
Nicole Thomas
6eded8fb43
Merge pull request #21152 from s0undt3ch/2015.2
...
[2015.2] Update bootstrap script to latest stable, v2015.02.28
2015-02-28 09:05:00 -07:00
Pedro Algarvio
a01a3c29c8
Update bootstrap script to latest stable, v2015.02.28
...
* Fix Debian backports repository.
2015-02-28 15:11:21 +00:00
Erik Johnson
5cc7b61d8a
Merge pull request #21147 from terminalmage/rename-lxc-cmd-funcs
...
Rename new lxc.cmd_run*, lxc.cmd_retcode functions
2015-02-28 00:11:12 -06:00
Erik Johnson
c734a7db18
Update LXC tutorial to reflect function name change
2015-02-27 23:10:22 -06:00
Erik Johnson
694a4678aa
Rename new lxc.cmd_run*, lxc.cmd_retcode functions
...
These are often typo'ed due to their resemblance to cmd.run,
cmd.run_stdout, etc. This commit renames them, removing the "cmd_" and
making them lxc.run, lxc.run_stdout, etc.
Now's the time to do this since these functions have not yet seen an
official release.
2015-02-27 23:10:22 -06:00
C. R. Oldham
c24834291b
Merge pull request #21136 from cro/2015-02-27mergeforward1
...
Merge forward from 2014.7 to 2015.2.
2015-02-27 21:55:29 -07:00
C. R. Oldham
1ff3192c20
Fileserver lists return lists
2015-02-27 17:24:25 -07:00
Aditya Kulkarni
d4c3bbf166
Merge pull request #21139 from pass-by-value/update_config_wheel
...
Add wheel function to update master config
2015-02-27 16:48:46 -07:00
jfindlay
02d3b3e64c
Merge pull request #21135 from cro/ugly_pyrax_error2
...
Import salt.utils.openstack.pyrax differently to avoid failed import by loader
2015-02-27 16:22:32 -07:00
jfindlay
3f415683e9
Merge pull request #21080 from freimer/private_key_fix
...
Private key fix
2015-02-27 16:21:53 -07:00
Aditya Kulkarni
1f1bb2954f
Add wheel function to update master config
2015-02-27 15:59:14 -07:00
C. R. Oldham
3034c343ba
Fixup a few merge conflict problems & pylint
2015-02-27 15:26:51 -07:00
Fred Reimer
7976f5a694
Added pylink disable W0611
2015-02-27 17:23:35 -05:00
C. R. Oldham
c9610bc4f2
Merge commit, merge forward 2014.7 to 2015.2
2015-02-27 15:01:30 -07:00
jond64
f8bde515fd
Fix for #21039
2015-02-27 14:54:00 -07:00
