docker_* modules: fix various errors in argument specs (#65632)
* Fix various errors in docker module argument specs. * Adjust PR #. * Fix option name. * Fix username/password requirements for docker_login.
This commit is contained in:
parent
9f87978eb3
commit
e9cec0262d
9 changed files with 11 additions and 18 deletions
3
changelogs/fragments/65632-docker-argspec-fixup.yml
Normal file
3
changelogs/fragments/65632-docker-argspec-fixup.yml
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
bugfixes:
|
||||||
|
- "docker_image - fix validation of build options."
|
||||||
|
- "docker_login - fix error handling when ``username`` or ``password`` is not specified when ``state`` is ``present``."
|
|
@ -804,7 +804,7 @@ class ImageManager(DockerBaseClass):
|
||||||
def main():
|
def main():
|
||||||
argument_spec = dict(
|
argument_spec = dict(
|
||||||
source=dict(type='str', choices=['build', 'load', 'pull', 'local']),
|
source=dict(type='str', choices=['build', 'load', 'pull', 'local']),
|
||||||
build=dict(type='dict', suboptions=dict(
|
build=dict(type='dict', options=dict(
|
||||||
cache_from=dict(type='list', elements='str'),
|
cache_from=dict(type='list', elements='str'),
|
||||||
container_limits=dict(type='dict', options=dict(
|
container_limits=dict(type='dict', options=dict(
|
||||||
memory=dict(type='int'),
|
memory=dict(type='int'),
|
||||||
|
|
|
@ -37,9 +37,9 @@ options:
|
||||||
- An image name or a list of image names. Name format will be C(name[:tag]) or C(repository/name[:tag]),
|
- An image name or a list of image names. Name format will be C(name[:tag]) or C(repository/name[:tag]),
|
||||||
where C(tag) is optional. If a tag is not provided, C(latest) will be used. Instead of image names, also
|
where C(tag) is optional. If a tag is not provided, C(latest) will be used. Instead of image names, also
|
||||||
image IDs can be used.
|
image IDs can be used.
|
||||||
|
- If no name is provided, a list of all images will be returned.
|
||||||
type: list
|
type: list
|
||||||
elements: str
|
elements: str
|
||||||
required: yes
|
|
||||||
|
|
||||||
extends_documentation_fragment:
|
extends_documentation_fragment:
|
||||||
- docker
|
- docker
|
||||||
|
|
|
@ -29,7 +29,6 @@ description:
|
||||||
- Running in check mode will perform the authentication without updating the config file.
|
- Running in check mode will perform the authentication without updating the config file.
|
||||||
options:
|
options:
|
||||||
registry_url:
|
registry_url:
|
||||||
required: False
|
|
||||||
description:
|
description:
|
||||||
- The registry URL.
|
- The registry URL.
|
||||||
type: str
|
type: str
|
||||||
|
@ -39,16 +38,15 @@ options:
|
||||||
- url
|
- url
|
||||||
username:
|
username:
|
||||||
description:
|
description:
|
||||||
- The username for the registry account
|
- The username for the registry account.
|
||||||
|
- Required when I(state) is C(present).
|
||||||
type: str
|
type: str
|
||||||
required: yes
|
|
||||||
password:
|
password:
|
||||||
description:
|
description:
|
||||||
- The plaintext password for the registry account
|
- The plaintext password for the registry account.
|
||||||
|
- Required when I(state) is C(present).
|
||||||
type: str
|
type: str
|
||||||
required: yes
|
|
||||||
email:
|
email:
|
||||||
required: False
|
|
||||||
description:
|
description:
|
||||||
- Does nothing, do not use.
|
- Does nothing, do not use.
|
||||||
- Will be removed in Ansible 2.14.
|
- Will be removed in Ansible 2.14.
|
||||||
|
|
|
@ -218,7 +218,7 @@ def main():
|
||||||
'prune': dict(type='bool', default=False),
|
'prune': dict(type='bool', default=False),
|
||||||
'with_registry_auth': dict(type='bool', default=False),
|
'with_registry_auth': dict(type='bool', default=False),
|
||||||
'resolve_image': dict(type='str', choices=['always', 'changed', 'never']),
|
'resolve_image': dict(type='str', choices=['always', 'changed', 'never']),
|
||||||
'state': dict(tpye='str', default='present', choices=['present', 'absent']),
|
'state': dict(type='str', default='present', choices=['present', 'absent']),
|
||||||
'absent_retries': dict(type='int', default=0),
|
'absent_retries': dict(type='int', default=0),
|
||||||
'absent_retries_interval': dict(type='int', default=1)
|
'absent_retries_interval': dict(type='int', default=1)
|
||||||
},
|
},
|
||||||
|
|
|
@ -76,7 +76,6 @@ options:
|
||||||
Note that removing requires Docker SDK for Python >= 2.4.0.
|
Note that removing requires Docker SDK for Python >= 2.4.0.
|
||||||
- Set to C(inspect) to display swarm informations.
|
- Set to C(inspect) to display swarm informations.
|
||||||
type: str
|
type: str
|
||||||
required: yes
|
|
||||||
default: present
|
default: present
|
||||||
choices:
|
choices:
|
||||||
- present
|
- present
|
||||||
|
|
|
@ -55,7 +55,6 @@ options:
|
||||||
description:
|
description:
|
||||||
- Name of the file containing the config. Defaults to the I(config_name) if not specified.
|
- Name of the file containing the config. Defaults to the I(config_name) if not specified.
|
||||||
type: str
|
type: str
|
||||||
required: yes
|
|
||||||
uid:
|
uid:
|
||||||
description:
|
description:
|
||||||
- UID of the config file's owner.
|
- UID of the config file's owner.
|
||||||
|
@ -194,7 +193,6 @@ options:
|
||||||
- Service image path and tag.
|
- Service image path and tag.
|
||||||
- Corresponds to the C(IMAGE) parameter of C(docker service create).
|
- Corresponds to the C(IMAGE) parameter of C(docker service create).
|
||||||
type: str
|
type: str
|
||||||
required: yes
|
|
||||||
labels:
|
labels:
|
||||||
description:
|
description:
|
||||||
- Dictionary of key value pairs.
|
- Dictionary of key value pairs.
|
||||||
|
@ -640,7 +638,6 @@ options:
|
||||||
- C(present) - Asserts the existence of a service matching the name and provided configuration parameters.
|
- C(present) - Asserts the existence of a service matching the name and provided configuration parameters.
|
||||||
Unspecified configuration parameters will be set to docker defaults.
|
Unspecified configuration parameters will be set to docker defaults.
|
||||||
type: str
|
type: str
|
||||||
required: yes
|
|
||||||
default: present
|
default: present
|
||||||
choices:
|
choices:
|
||||||
- present
|
- present
|
||||||
|
|
|
@ -282,7 +282,7 @@
|
||||||
name: "{{ iname }}"
|
name: "{{ iname }}"
|
||||||
build:
|
build:
|
||||||
path: "{{ role_path }}/files"
|
path: "{{ role_path }}/files"
|
||||||
dockefile: "EtcHostsDockerfile"
|
dockerfile: "EtcHostsDockerfile"
|
||||||
pull: no
|
pull: no
|
||||||
etc_hosts:
|
etc_hosts:
|
||||||
some-custom-host: "127.0.0.1"
|
some-custom-host: "127.0.0.1"
|
||||||
|
|
|
@ -787,10 +787,6 @@ lib/ansible/modules/cloud/dimensiondata/dimensiondata_vlan.py validate-modules:d
|
||||||
lib/ansible/modules/cloud/dimensiondata/dimensiondata_vlan.py validate-modules:doc-required-mismatch
|
lib/ansible/modules/cloud/dimensiondata/dimensiondata_vlan.py validate-modules:doc-required-mismatch
|
||||||
lib/ansible/modules/cloud/dimensiondata/dimensiondata_vlan.py validate-modules:parameter-type-not-in-doc
|
lib/ansible/modules/cloud/dimensiondata/dimensiondata_vlan.py validate-modules:parameter-type-not-in-doc
|
||||||
lib/ansible/modules/cloud/docker/docker_container.py use-argspec-type-path # uses colon-separated paths, can't use type=path
|
lib/ansible/modules/cloud/docker/docker_container.py use-argspec-type-path # uses colon-separated paths, can't use type=path
|
||||||
lib/ansible/modules/cloud/docker/docker_image_info.py validate-modules:doc-required-mismatch
|
|
||||||
lib/ansible/modules/cloud/docker/docker_login.py validate-modules:doc-required-mismatch
|
|
||||||
lib/ansible/modules/cloud/docker/docker_swarm.py validate-modules:doc-required-mismatch
|
|
||||||
lib/ansible/modules/cloud/docker/docker_swarm_service.py validate-modules:doc-required-mismatch
|
|
||||||
lib/ansible/modules/cloud/google/_gcdns_record.py validate-modules:parameter-type-not-in-doc
|
lib/ansible/modules/cloud/google/_gcdns_record.py validate-modules:parameter-type-not-in-doc
|
||||||
lib/ansible/modules/cloud/google/_gcdns_zone.py validate-modules:parameter-type-not-in-doc
|
lib/ansible/modules/cloud/google/_gcdns_zone.py validate-modules:parameter-type-not-in-doc
|
||||||
lib/ansible/modules/cloud/google/_gce.py pylint:blacklisted-name
|
lib/ansible/modules/cloud/google/_gce.py pylint:blacklisted-name
|
||||||
|
|
Loading…
Reference in a new issue