Commit graph

8573 commits

Author SHA1 Message Date
chouseknecht
7f97cf4d04
Fix compose_version error. Check has compose before checking version. 2016-06-21 02:49:22 -04:00
Allen Sanabria
343c3ecfb9 Fixes #1715 Allow authorized_module accept multi. (#3573)
This will allow the authorized_module to accept options that can be
passed multiple times into ssh options. For instance permitopen.
2016-06-20 17:32:44 -04:00
Mario David
ae5ccf29ed add project to os_router (#3869)
* add project to os_router

* version_added fix

* correct place of version_added

* remove extraneous else

* * add shade version dependency check
* option project only on router creation

* * fix shade minimal version
* remove pop of option project

* * fix square brackets
* delete router by router_id
2016-06-20 10:10:59 -04:00
Stanislav Antic
f0f5272f90 Fix wait_for on python < 2.6 (#3790) (#3973) 2016-06-17 10:04:26 -04:00
Brian Coca
a1e6311197 reverted need for module utils imports 2016-06-16 18:12:38 -04:00
Matt Davis
b2b5fceea2 Merge pull request #3965 from ewigkeit1204/fix-copy-module
Do not copy file if running on check mode
2016-06-16 12:58:06 -07:00
Brian Coca
ab4ec24813 added missing import
readded raise
2016-06-16 15:55:45 -04:00
Brian Coca
4a0c483e09 exception ans sys.exit fixes 2016-06-16 15:27:37 -04:00
Toshio Kuratomi
f9b28aaae3 Fix exception handling in async_wrapper 2016-06-16 12:21:57 -07:00
Keisuke Kamada
74864c2d85 Do not copy file if running on check mode 2016-06-17 02:19:52 +09:00
Adam Butler
1c41b6fdb2 Fixes incorrect key name protocols -> protocol (#3963) 2016-06-16 10:04:05 -04:00
nitzmahone
d4eaeac8c9 StrictMode fixes for win_get_url 2016-06-15 14:46:56 -07:00
Brian Coca
949916a155 restored incorrectly removed docs, jinja2 override 2016-06-15 17:01:46 -04:00
Hagen Kuehn
a5fdd8c128 fixed unknown type <type 'list'> error (#3959) 2016-06-15 14:26:00 -04:00
Brano Zarnovican
3456c24b96 Py2.4: SystemExit in async_wrapper is not an error - compatibility fix
Prior to Python 2.5, SystemExit was a subclass of Exception.
In Py2.4, this is causing extra error output on valid sys.exit(0).

(Toshio) Call sys.exit from inside of the SystemExit exception handler so py2.4 and py2.5+ behaviour matches
2016-06-15 10:28:09 -07:00
Brian Coca
dbf5d10025 updated raw docs for environment and executable
it should now reflect how raw works in combination with
become and environment directives
2016-06-15 11:23:20 -04:00
nitzmahone
e992cfd473 rename ansible_winrm_certificate_expires fact to avoid collision with connection vars 2016-06-14 11:33:00 -07:00
Chris Houseknecht
0802569af9 Merge pull request #3894 from stefanha/docker_image-load_image-streaming
Stream image data in load_image() to avoid out-of-memory
2016-06-14 01:10:26 -04:00
Chris Houseknecht
0098dc322f Merge pull request #3535 from picpicpic/devel
fixes dns type in docker module
2016-06-13 18:28:18 -04:00
Chris Houseknecht
43cab8322a Merge pull request #3947 from chouseknecht/devel
docker_container detach not waiting on container to execute.
2016-06-13 18:19:09 -04:00
chouseknecht
d988187860
Remove dns from container create parameters. 2016-06-13 18:06:20 -04:00
chouseknecht
0884a942bf Fix #3945 docker_container detach not waiting on container to execute. 2016-06-13 16:30:21 -04:00
Brian Coca
46d6bead71 document that get_url also takes file params
has for a long time, but was never documented, mode,group, owner can all be set here
2016-06-13 15:52:57 -04:00
Brian Coca
172bd21f41 Revert "Add mode option to the list" (#3946) 2016-06-13 15:48:43 -04:00
Victor Bocharsky
3573223aeb Add mode option to docstring for get_url (#3630)
Add mode option to the list
2016-06-13 15:36:23 -04:00
Adrian Likins
97ac3f2cc8 Merge pull request #3701 from gillesgagniard/gce-subnetwork-dev
GCE : Add support for subnet networks
2016-06-13 15:33:27 -04:00
Adrian Likins
ec569ac89e Merge pull request #3926 from neowu/devel
fix unarchive doesn't extract changed tar file
2016-06-13 15:31:44 -04:00
Toshio Kuratomi
1d0f408897 Finish python3 syntax compilation fixing for core repo 2016-06-13 12:00:31 -07:00
codemeup @ Work
1e0bb94ced Fixing compile time errors irt (, e => as e, print(), ocat now 0o not 0) exception handling for Python 3 (#3851)
* Fixing compile time errors irt a) exception handling for Python 3 in util, also: b) problem octal usage (fixed) and c) print json_dump -> print(json_dump(xyz) ... et al

* This code was not Python 2.4 compliant. Octal codes and exception handling is now working with Py 2.4, 2.6, & 3.5.

* Fixing formating (or rather reverting an non 2.4 compatible change). Works in compile & runtime checking.

* a) revert to use print sys.stderr not fail_json; b) fixed var name in exception

* Python 3 compatible print (print >>sys.stderr will generate a TypeError - now uses sys.stderr.write instead).
2016-06-13 11:40:13 -07:00
Chris Houseknecht
1a6fd35561 Merge pull request #3944 from chouseknecht/devel
avoid removing attached containers by default
2016-06-13 14:12:35 -04:00
chouseknecht
af8eabe06f Fix #3941 2016-06-13 14:08:20 -04:00
Chris Houseknecht
d6f01d0b4f Merge pull request #3931 from stefanha/docker_service-PyYAML-requirement
docker_service: make PyYAML requirement explicit
2016-06-11 13:14:41 -04:00
Stefan Hajnoczi
8254e2b547 docker_service: make PyYAML requirement explicit
The "Developing Modules" documentation states:

  Include a minimum of dependencies if possible. If there are
  dependencies, document them at the top of the module file, and have
  the module raise JSON error messages when the import fails.

When docker_service runs on a remote host without PyYAML it crashes with
ImportError.

This patch raises a JSON error message when import fails, but only if
the PyYAML module is actually used.  It's only needed when the
"definition" parameter is given.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
2016-06-11 17:29:39 +01:00
Chris Houseknecht
1eb63c7567 Merge pull request #3928 from chouseknecht/fix_16211
Fix #3927 - only stop/kill running containers
2016-06-10 22:59:23 -04:00
chouseknecht
b9b727f435 Fix #16211 - only stop/kill running containers 2016-06-10 22:41:41 -04:00
neo
606598a857 fix unarchive doesn't extract changed tar file #3901 2016-06-10 17:35:08 -04:00
Chris Houseknecht
964d9b3a6d Fix #3906 - Enforce required minimum compose version. (#3925)
* Fix #3906 - Require minimum compose version.

* Fix typo in message text.
2016-06-10 17:26:29 -04:00
Matt Fischer
1f5335d5e0 Update delete notes for Synrhconize docs (#3723)
The example for delete=yes does not specify recursive although it is
required. In addition, the wording for the delete option is confusing
about from where files are really deleted. This should clarify that.
2016-06-10 15:11:24 -04:00
Thomas Quinot
00fb13010c Clarify behaviour when state=present and no name is given (#3904) 2016-06-10 13:03:01 -04:00
Dag Wieers
08f531f92e Update GitHub templates to reflect ansible/ansible (#3900)
* Update GitHub templates to reflect ansible/ansible

Update the GitHub templates to what is used for some time on ansible/ansible
For more information, see ansible/ansible#15961

* Small improvement from ansible/ansible
2016-06-10 11:57:00 -04:00
Dag Wieers
c14d4755e6 Adapt module to use new module._name property (#3918)
This is in line with the change from ansible/ansible#16087
2016-06-10 11:45:49 -04:00
Dag Wieers
3f7a935932 Improve the unzip output scraping (#3819)
* Improve the unzip output scraping

Ensure we capture the complete file (also when it includes spaces).
Drop lines that do not conform (in length) to what we expect (e.g. header/footer).

This fixes #3813

* Fix how split() works
2016-06-10 11:05:22 -04:00
Bradley Phipps
4a8930f886 added missing colons to documentation (#3913) 2016-06-10 09:44:57 -04:00
Toshio Kuratomi
138430f116 Revert "Fix git shallow update (#3794)" -- Broke integration tests:
https://app.shippable.com/runs/57599a7897ae890c00c2898d

This reverts commit c26eb1217f.
2016-06-09 14:48:51 -07:00
jctanner
4a3916bd46 Use the six import for urlsplit instead of importing directly. (#3902)
Fixes https://github.com/ansible/ansible/issues/16191
2016-06-09 13:25:17 -04:00
Robin Roth
c26eb1217f Fix git shallow update (#3794)
* remove unused variables

* fetch branch name instead of HEAD

fix #3782, which was introduced by f1bacc1d3f

* disable git depth option for old git versions

fixes #3782
git support for `--depth` did not fully work in old git versions (before 1.8.2)
fall back to full clones/fetches on those versions
2016-06-09 08:51:02 -07:00
Stefan Hajnoczi
47cc422b8a Stream image data in load_image() to avoid out-of-memory
Reading the entire tar file into memory can result in out-of-memory
conditions such as this traceback:

Traceback (most recent call last):
  File "/tmp/ansible_YELTSu/ansible_module_docker_image.py", line 486, in load_image
    self.client.load_image(image_data)
  File "/usr/local/lib/python2.7/dist-packages/docker/api/image.py", line 147, in load_image
    res = self._post(self._url("/images/load"), data=data)
  ...
  File "/usr/lib/python2.7/httplib.py", line 997, in endheaders
    self._send_output(message_body)
  File "/usr/lib/python2.7/httplib.py", line 848, in _send_output
    msg += message_body
MemoryError

Luckily docker-py's load_image(), which calls requests post(), accepts a
file-like object instead of a string.  Pass in the file object to avoid
reading the full file into memory.  This allows larger tar files to load
succesfully.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
2016-06-08 23:50:44 +01:00
Matt Davis
e2d6b8e288 Merge pull request #3850 from Hypermanzer/utilities_helper_accelerate_p2_p3
Fixing compile time errors irt exception handling for Python 3. This …
2016-06-08 10:15:18 -07:00
Vince v. Oosten
fd418c19c2 move environment variable gathering to end of __init__() (#3890)
* This moves the lines in the code that parse the `env` and `env_file` options for docker to the end of the `__init__()` function.
This is needed because the `_check_capabilites` function needs both a working `self.client` and a proper `self.docker_py_versioninfo`.
`_check_capabilities` is used by `ensure_capabilities` which is, in turn, used by `get_environment`

This means that before this commit, the environment variables could not be loaded because both `self.client` and `self.docker_py_versioninfo` were not set at that time.

This commit fixes that by putting the environment variable parsing after those two.

* This moves the lines in the code that parse the `env` and `env_file` options for docker to the end of the `__init__()` function.
This is needed because the `_check_capabilites` function needs both a working `self.client` and a proper `self.docker_py_versioninfo`.
`_check_capabilities` is used by `ensure_capabilities` which is, in turn, used by `get_environment`

This means that before this commit, the environment variables could not be loaded because both `self.client` and `self.docker_py_versioninfo` were not set at that time.

This commit fixes that by putting the environment variable parsing after those two.
2016-06-08 09:39:34 -04:00
Matt Davis
a8e5f27b2c Iam trust policy (#3885)
* added support for trust policies

* added version_added to new params in DOC string

* update version_added on new iam args to 2.2
2016-06-08 09:23:55 -04:00