cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove registery option per #3824.

Browse source
This commit is contained in:
chouseknecht 2016-06-02 11:39:25 -04:00 committed by Matt Clay
parent be2d32f04d
commit c9e4955d38
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/ansible/modules/cloud/docker/docker_container.py
View file

@ -112,8 +112,8 @@ options:
required: false required: false
etc_hosts: etc_hosts:
description: description:
- Dict of host-to-IP mappings, where each host name is key in the dictionary. - Dict of host-to-IP mappings, where each host name is a key in the dictionary.
Hostname will be added to the container's /etc/hosts file. Each host name will be added to the container's /etc/hosts file.
default: null default: null
required: false required: false
exposed_ports: exposed_ports:
@ -127,7 +127,7 @@ options:
- exposed - exposed
force_kill: force_kill:
description: description:
- Use with absent, present, started and stopped states to use the kill command rather than the stop command. - Use the kill command when stopping a running container.
default: false default: false
required: false required: false
groups: groups:
@ -142,10 +142,10 @@ options:
required: false required: false
ignore_image: ignore_image:
description: description:
- When state is present or started the module compares the configuration of an existing - When C(state) is I(present) or I(started) the module compares the configuration of an existing
container to requested configuration. The evaluation includes the image version. If container to requested configuration. The evaluation includes the image version. If
the image vesion in the registry does not match the container, the container will be the image vesion in the registry does not match the container, the container will be
rebuilt. To stop this behavior set ignore_image to true. recreated. Stop this behavior by setting C(ignore_image) to I(True).
default: false default: false
required: false required: false
image: image:
@ -318,12 +318,6 @@ options:
- Use with present and started states to force the re-creation of an existing container. - Use with present and started states to force the re-creation of an existing container.
default: false default: false
required: false required: false
registry:
description:
- Registry URL from which to pull images. If not specified, images will be pulled from
the default registry found in the local docker config.json file.
default: null
required: false
restart: restart:
description: description:
- Use with started state to force a matching container to be stopped and restarted. - Use with started state to force a matching container to be stopped and restarted.