assign a sane default to yum/dnf lock_timeout, in line with cli (#57383)

* assign a sane default to yum/dnf lock_timeout, in line with cli

Fixes #57189

Signed-off-by: Adam Miller <admiller@redhat.com>

* fix typo in changelog snippet

Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2019-06-13 10:17:24 -05:00 committed by ansibot
parent 3efb57f64e
commit d2dc4c9bc4
4 changed files with 6 additions and 3 deletions

View file

@ -0,0 +1,3 @@
minor_changes:
- yum - set lock_timeout to a sane default (30 seconds, as is the cli)
- dnf - set lock_timeout to a sane default (30 seconds, as is the cli)

View file

@ -46,7 +46,7 @@ yumdnf_argument_spec = dict(
update_cache=dict(type='bool', default=False, aliases=['expire-cache']), update_cache=dict(type='bool', default=False, aliases=['expire-cache']),
update_only=dict(required=False, default="no", type='bool'), update_only=dict(required=False, default="no", type='bool'),
validate_certs=dict(type='bool', default=True), validate_certs=dict(type='bool', default=True),
lock_timeout=dict(type='int', default=0), lock_timeout=dict(type='int', default=30),
), ),
required_one_of=[['name', 'list', 'update_cache']], required_one_of=[['name', 'list', 'update_cache']],
mutually_exclusive=[['name', 'list']], mutually_exclusive=[['name', 'list']],

View file

@ -181,7 +181,7 @@ options:
description: description:
- Amount of time to wait for the dnf lockfile to be freed. - Amount of time to wait for the dnf lockfile to be freed.
required: false required: false
default: 0 default: 30
type: int type: int
version_added: "2.8" version_added: "2.8"
install_weak_deps: install_weak_deps:

View file

@ -187,7 +187,7 @@ options:
description: description:
- Amount of time to wait for the yum lockfile to be freed. - Amount of time to wait for the yum lockfile to be freed.
required: false required: false
default: 0 default: 30
type: int type: int
version_added: "2.8" version_added: "2.8"
install_weak_deps: install_weak_deps: