From bb6955c5eb0cecf2ee4ca6eb6bb4e65f17669c9f Mon Sep 17 00:00:00 2001 From: YuandongXu <786018072@qq.com> Date: Tue, 18 Jun 2019 09:29:36 +0800 Subject: [PATCH] Backport/2.8/57257 option is marked as required but specifies a default (#57750) * option is marked as required but specifies a default (#57257) * required and default are conflicting (cherry picked from commit 05e6339c49f198448709dd982420da872a5c59d1) * add a changelog fragment for PR 57750. --- ...option-is-marked-as-required-but-specifies-a-default.yml | 2 ++ lib/ansible/modules/network/cloudengine/ce_reboot.py | 6 +++--- test/sanity/validate-modules/ignore.txt | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 changelogs/fragments/57750-option-is-marked-as-required-but-specifies-a-default.yml diff --git a/changelogs/fragments/57750-option-is-marked-as-required-but-specifies-a-default.yml b/changelogs/fragments/57750-option-is-marked-as-required-but-specifies-a-default.yml new file mode 100644 index 00000000000..0601fada99c --- /dev/null +++ b/changelogs/fragments/57750-option-is-marked-as-required-but-specifies-a-default.yml @@ -0,0 +1,2 @@ +bugfixes: + - option is marked as required but specifies a default.(https://github.com/ansible/ansible/pull/57257) diff --git a/lib/ansible/modules/network/cloudengine/ce_reboot.py b/lib/ansible/modules/network/cloudengine/ce_reboot.py index e8b8cb0f839..040f103b4be 100644 --- a/lib/ansible/modules/network/cloudengine/ce_reboot.py +++ b/lib/ansible/modules/network/cloudengine/ce_reboot.py @@ -34,7 +34,7 @@ options: description: - Safeguard boolean. Set to true if you're sure you want to reboot. type: bool - default: false + required: true save_config: description: - Flag indicating whether to save the configuration. @@ -134,8 +134,8 @@ def main(): """ main """ argument_spec = dict( - confirm=dict(required=True, type='bool', default='false'), - save_config=dict(required=False, type='bool', default='false') + confirm=dict(required=True, type='bool'), + save_config=dict(default=False, type='bool') ) argument_spec.update(ce_argument_spec) diff --git a/test/sanity/validate-modules/ignore.txt b/test/sanity/validate-modules/ignore.txt index 66c794a9885..a565b7683e9 100644 --- a/test/sanity/validate-modules/ignore.txt +++ b/test/sanity/validate-modules/ignore.txt @@ -464,7 +464,6 @@ lib/ansible/modules/network/cloudengine/ce_ntp.py E322 lib/ansible/modules/network/cloudengine/ce_ntp_auth.py E322 lib/ansible/modules/network/cloudengine/ce_ospf.py E322 lib/ansible/modules/network/cloudengine/ce_ospf_vrf.py E322 -lib/ansible/modules/network/cloudengine/ce_reboot.py E317 lib/ansible/modules/network/cloudengine/ce_reboot.py E322 lib/ansible/modules/network/cloudengine/ce_rollback.py E322 lib/ansible/modules/network/cloudengine/ce_sflow.py E322