Commit graph

15 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
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
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
chouseknecht
904d947172 Fix for issue 3740. Make docker_service more resilient when targeting older API versions. 2016-05-25 16:38:38 -04:00
Shubham
64b104ac37 remove module argument, fix #3682 (#3683) 2016-05-17 14:36:05 -04:00
Matt Martz
9b6a7eb4f9 Revert "Fix doc strings spacing."
This reverts commit 127d518011.
2016-05-15 17:43:28 -05:00
chouseknecht
127d518011
Fix doc strings spacing. 2016-05-14 09:34:15 -04:00
chouseknecht
a81d0a6809
Fix doc strings. Missing requirements and doc fragment reference. 2016-05-14 09:13:47 -04:00
chouseknecht
3a5dd00076
Fixed files/project_files naming. Correct name is files. 2016-05-12 05:31:10 -04:00
chouseknecht
22853efeed
Flip version added back to 2.2 to make tests pass. 2016-05-12 05:04:21 -04:00
chouseknecht
834d2fb9fe
Moving version added to 2.1 2016-05-12 04:44:35 -04:00
chouseknecht
282b2d45df
Added actions to RETURN docs. Show actions when debug or check mode. 2016-05-12 04:42:50 -04:00
chouseknecht
c2d2189274
Removed use of --diff. Replaced 'diff' in output with 'actions'. Only show 'actions' in output if debug true. 2016-05-11 15:01:29 -04:00
chouseknecht
f69b352341 Removed fail method. Combined recreate and force_recreate params. 2016-05-11 13:50:55 -04:00
chouseknecht
d9b026dcef Adding docker_service 2016-05-11 13:50:55 -04:00