Commit Graph

59441 Commits

Author SHA1 Message Date
Nasenbaer
983609984c Renamed param name to ami_name to be consistent with aws 2015-09-18 16:26:35 +02:00
Nasenbaer
da64431f8e Added find_images function to search for AMIs 2015-09-18 15:06:01 +02:00
Heinz Wiesinger
48023669e7 Support permanent per interface firewalld zone configuration on rh7 systems.
Fixes #27222
2015-09-18 14:17:08 +02:00
Nasenbaer
5a7ffcd66b Rename name parameter to make a distinction between ami and instance name 2015-09-18 13:22:53 +02:00
Nasenbaer
b2a5506447 Create_image function to create an AMI from existing instances 2015-09-18 13:22:53 +02:00
Bo Maryniuk
dba47ecaed Return UTC timestamp for modification of path. 2015-09-18 11:50:34 +02:00
Nasenbaer
cccdeee18a fixes #27217 clear_old_remotes clears wrong directory (gitfs) 2015-09-18 09:57:32 +02:00
Erik Johnson
801a49c8e2 Add ability to decrypt CLI pillar data 2015-09-17 22:35:50 -05:00
Erik Johnson
f02b1dd8bf Support decrypting ciphertext with newlines as literal '\n'
This allows for CLI pillar data to be passed to the gpg renderer and the
newlines translated from '\n' to actual newline characters so that the
ciphertext can be decrypted successfully.
2015-09-17 22:34:38 -05:00
Thomas Jackson
e7526bdb44 Correctly support https, port 443 is not a requirement 2015-09-17 19:05:10 -07:00
macgyver13
5b906b31d7 Make get_event compatible with salt/client 2015-09-17 21:00:35 -04:00
Seth House
6be5745f61 Add local_subset client to docs 2015-09-17 18:03:04 -06:00
Seth House
35b2c5df0d Remove old versionadded from local_batch client 2015-09-17 18:03:04 -06:00
Seth House
576733fa59 Add new netapi client that wraps LocalClient.cmd_subset 2015-09-17 18:03:04 -06:00
rallytime
808a5b3b81 Make sure we set the full data to the ret variable 2015-09-17 17:54:09 -06:00
rallytime
9b635004e2 Refactor some digital_ocean functions to help simplify the driver 2015-09-17 17:36:28 -06:00
Colton Myers
a84ce67b8f Add test.nop state
A no-op state that does nothing. Useful in conjunction with the `use`
requisite, or in templates which could otherwise be empty due to jinja
rendering

Unlike test.succeed_without_changes, takes **kwargs to be more flexible.

Also removed the test stuff from succeed_without_changes. If a state
doesn't make changes, its behavior should be identical whether in test
mode or not.
2015-09-17 17:22:49 -06:00
Colton Myers
9ddc88c6ba Merge pull request #27198 from basepi/merge-forward-develop
Merge forward from 2015.8 to develop
2015-09-17 15:33:15 -06:00
Justin Findlay
8b2cb330e3 Merge pull request #27203 from whiteinge/sphinx-apidoc-wrapper
Add script to run sphinx-apidoc against our module directories
2015-09-17 15:23:20 -06:00
rallytime
cced6e9031 Don't repeat GCE setup instructions, and make the use of .json files clearer 2015-09-17 15:07:49 -06:00
Colton Myers
1cbfa06591 Remove heavily-mocked failing test 2015-09-17 14:38:05 -06:00
rallytime
ebf91c330c Small code clean up 2015-09-17 14:23:30 -06:00
Seth House
fed627763b Add script to run sphinx-apidoc against our module directories
The script itself is pretty inflexible so we're doing a little find &
sed trickery around it.
2015-09-17 14:22:12 -06:00
Colton Myers
8c204a45ab Merge pull request #27197 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2015-09-17 13:53:22 -06:00
Colton Myers
7f391a409c Fix lint 2015-09-17 13:52:24 -06:00
Justin Findlay
1b620b77cd rename hash_host arg to hash_known_hosts
Fixes #27187.
2015-09-17 12:41:19 -06:00
Justin Findlay
12f14ae37c update hash_known_hosts docs in ssh module 2015-09-17 12:08:49 -06:00
Mike Place
6747400e1c Merge pull request #27174 from tinyclues/26505_saltnado_improve_accept_support
Improve support of Accept header in saltnado.
2015-09-17 12:04:25 -06:00
Mike Place
430c48c5ea Merge pull request #27195 from jacobhammons/doc-build
Fixed sphinx / latex build warnings and errors
2015-09-17 11:28:37 -06:00
Mike Place
3717330d04 Merge pull request #27192 from DSRCompany/issues/26885_salt_call_zmq_monitor_fix
Correclty install zeromq ioloop.
2015-09-17 11:26:18 -06:00
Mike Place
7a34c7742d Merge pull request #27172 from rallytime/bp-27150
Back-port #27150 to 2015.5
2015-09-17 11:25:51 -06:00
Mike Place
8f8e75c5ff Merge pull request #27182 from Awingu/2015.8
fix restart_on_error
2015-09-17 11:24:01 -06:00
Colton Myers
26b6c92975 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    doc/conf.py
    salt/config/__init__.py
    salt/modules/rh_ip.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/user.py
    salt/templates/rh_ip/rh7_eth.jinja
2015-09-17 11:10:37 -06:00
rallytime
6b2a00e947 Avoid RunTimeError (dictionary changed size during iteration) with keys()
Fixes #24573
2015-09-17 11:08:08 -06:00
Colton Myers
2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/conf.py
    doc/topics/cloud/gce.rst
    salt/cli/api.py
    salt/cli/call.py
    salt/cli/cp.py
    salt/cli/key.py
    salt/cli/run.py
    salt/cli/salt.py
    salt/modules/dockerio.py
    salt/states/dockerio.py
2015-09-17 10:54:33 -06:00
Jacob Hammons
fad87e34a2 Fixed lint errors 2015-09-17 10:27:54 -06:00
Justin Findlay
e956d88f5f Merge pull request #27194 from rallytime/bp-27180
Back-port #27180 to 2015.5
2015-09-17 10:17:24 -06:00
Mike Place
97d2a5fddc Merge pull request #27163 from terminalmage/issue27093
Workaround upstream tornado bug affecting redirects
2015-09-17 10:09:01 -06:00
Jacob Hammons
e56f02b025 re-add cheatsheet do-over 2015-09-17 09:32:52 -06:00
Jacob Hammons
60a8330561 re-added cheatsheet.tex 2015-09-17 09:29:09 -06:00
Tanky Woo
327d343fef file copy ret result True if no change in test mode 2015-09-17 09:26:16 -06:00
Jacob Hammons
f7a9e25d52 Fixed sphinx / latex build warnings and errors
Added missing modules to contents
2015-09-17 09:23:24 -06:00
Colton Myers
a02d043309 Merge pull request #27176 from basepi/merge-forward-2015.5
[2015.5] Merge forward from 2014.7 to 2015.5
2015-09-17 09:00:40 -06:00
Dmitry Kuzmenko
98a9ea5007 Correclty install zeromq ioloop. 2015-09-17 17:48:01 +03:00
Bernard Kerckenaere
693b81f7e4 fix restart_on_error #27127 2015-09-17 09:52:31 +02:00
Justin Findlay
d988aa2145 Merge pull request #27180 from tankywoo/file-copy-result-true-in-test
file copy ret result True if no change in test mode
2015-09-17 00:27:43 -06:00
Tanky Woo
8e3eecb03b file copy ret result True if no change in test mode 2015-09-17 13:29:56 +08:00
Joseph Hall
65c59ec2ea Merge pull request #27177 from rallytime/fix-19954
Remove note - incorrect info
2015-09-16 19:34:03 -06:00
rallytime
531b44243d Remove note - incorrect info 2015-09-16 19:30:03 -06:00
Colton Myers
66f4641be3 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
Conflicts:
    doc/conf.py
    salt/__init__.py
    salt/cli/__init__.py
2015-09-16 18:39:16 -06:00