From 2e073e73d2d2fe78bb5967704f35d19e1add0cf8 Mon Sep 17 00:00:00 2001 From: Chris Houseknecht Date: Wed, 19 Jul 2017 15:42:31 -0400 Subject: [PATCH] Fixes doc string in docker_volume (#27074) --- .../modules/cloud/docker/docker_volume.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/ansible/modules/cloud/docker/docker_volume.py b/lib/ansible/modules/cloud/docker/docker_volume.py index 5e0ac64a1a6..96d804e9a78 100644 --- a/lib/ansible/modules/cloud/docker/docker_volume.py +++ b/lib/ansible/modules/cloud/docker/docker_volume.py @@ -44,9 +44,8 @@ options: driver_options: description: - - > - Dictionary of volume settings. Consult docker docs for valid options and values: - U(https://docs.docker.com/engine/reference/commandline/volume_create/#driver-specific-options) + - "Dictionary of volume settings. Consult docker docs for valid options and values: + U(https://docs.docker.com/engine/reference/commandline/volume_create/#driver-specific-options)" labels: description: @@ -55,8 +54,8 @@ options: force: description: - With state C(present) causes the volume to be deleted and recreated if the volume already - exist and the driver, driver options or labels differ. - This will cause any data in the existing volume to be lost. + exist and the driver, driver options or labels differ. This will cause any data in the existing + volume to be lost. type: bool default: 'no' @@ -108,7 +107,13 @@ facts: ''' from ansible.module_utils.six import iteritems, text_type -from ansible.module_utils.docker_common import DockerBaseClass, AnsibleDockerClient, APIError +from ansible.module_utils.docker_common import DockerBaseClass, AnsibleDockerClient + +try: + from docker.errors import APIError +except: + # missing docker-py handled in ansible.module_utils.docker + pass class TaskParameters(DockerBaseClass):