From a0f38bdab5ae0e183cb960fe9e964bf1edf7c326 Mon Sep 17 00:00:00 2001 From: Daniel Jakots Date: Mon, 8 Oct 2018 14:56:40 -0400 Subject: [PATCH] Register missing parameter reboot_timeout (#46585) (cherry picked from commit 753711cd1295b5a0f303625680ee7221703a190c) --- changelogs/fragments/reboot_missing_parameter.yaml | 2 ++ lib/ansible/plugins/action/reboot.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/reboot_missing_parameter.yaml diff --git a/changelogs/fragments/reboot_missing_parameter.yaml b/changelogs/fragments/reboot_missing_parameter.yaml new file mode 100644 index 0000000000..8048e05912 --- /dev/null +++ b/changelogs/fragments/reboot_missing_parameter.yaml @@ -0,0 +1,2 @@ +bugfixes: +- reboot - add reboot_timeout parameter to the list of parameters so it can be used. diff --git a/lib/ansible/plugins/action/reboot.py b/lib/ansible/plugins/action/reboot.py index 19c8943ddd..af54d901eb 100644 --- a/lib/ansible/plugins/action/reboot.py +++ b/lib/ansible/plugins/action/reboot.py @@ -28,7 +28,7 @@ class TimedOutException(Exception): class ActionModule(ActionBase): TRANSFERS_FILES = False - _VALID_ARGS = frozenset(('connect_timeout', 'msg', 'post_reboot_delay', 'pre_reboot_delay', 'test_command')) + _VALID_ARGS = frozenset(('connect_timeout', 'msg', 'post_reboot_delay', 'pre_reboot_delay', 'test_command', 'reboot_timeout')) DEFAULT_REBOOT_TIMEOUT = 600 DEFAULT_CONNECT_TIMEOUT = None