From ead550d34ec446741154887deb37672ad975f117 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Tue, 21 Jan 2020 13:56:54 +0530 Subject: [PATCH] Fix argument spec for os_subnet and os_zone Ansible argument spec provides facility to provide choices for the given parameter. Module os_subnet and os_zone spells 'choices' incorrectly. This change fixes these modules, by changing 'choice' to 'choices'. Original Upstream PR: https://github.com/ansible/ansible/pull/65497 Change-Id: I3eed5feeef1234996f22bf8dfe7ecec0bc8eb298 Signed-off-by: Abhijeet Kasurde --- plugins/modules/os_subnet.py | 4 ++-- plugins/modules/os_zone.py | 2 +- tests/sanity/ignore-2.10.txt | 1 - tests/sanity/ignore-2.9.txt | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/plugins/modules/os_subnet.py b/plugins/modules/os_subnet.py index 7a99f2e9..24d049af 100644 --- a/plugins/modules/os_subnet.py +++ b/plugins/modules/os_subnet.py @@ -234,8 +234,8 @@ def main(): allocation_pool_start=dict(type='str'), allocation_pool_end=dict(type='str'), host_routes=dict(type='list', default=None), - ipv6_ra_mode=dict(type='str', choice=ipv6_mode_choices), - ipv6_address_mode=dict(type='str', choice=ipv6_mode_choices), + ipv6_ra_mode=dict(type='str', choices=ipv6_mode_choices), + ipv6_address_mode=dict(type='str', choices=ipv6_mode_choices), use_default_subnetpool=dict(type='bool', default=False), extra_specs=dict(type='dict', default=dict()), state=dict(type='str', default='present', choices=['absent', 'present']), diff --git a/plugins/modules/os_zone.py b/plugins/modules/os_zone.py index d80c8546..2eafca53 100644 --- a/plugins/modules/os_zone.py +++ b/plugins/modules/os_zone.py @@ -163,7 +163,7 @@ def _wait(timeout, cloud, zone, state, module, sdk): def main(): argument_spec = openstack_full_argument_spec( name=dict(required=True), - zone_type=dict(required=False, choice=['primary', 'secondary']), + zone_type=dict(required=False, choices=['primary', 'secondary']), email=dict(required=False, default=None), description=dict(required=False, default=None), ttl=dict(required=False, default=None, type='int'), diff --git a/tests/sanity/ignore-2.10.txt b/tests/sanity/ignore-2.10.txt index a8884ae7..709ab214 100644 --- a/tests/sanity/ignore-2.10.txt +++ b/tests/sanity/ignore-2.10.txt @@ -118,7 +118,6 @@ plugins/modules/os_volume.py validate-modules:doc-missing-type plugins/modules/os_volume.py validate-modules:parameter-type-not-in-doc plugins/modules/os_volume.py validate-modules:undocumented-parameter plugins/modules/os_volume_snapshot.py validate-modules:doc-missing-type -plugins/modules/os_zone.py validate-modules:doc-choices-do-not-match-spec plugins/modules/os_zone.py validate-modules:doc-missing-type plugins/modules/os_zone.py validate-modules:parameter-type-not-in-doc plugins/doc_fragments/openstack.py future-import-boilerplate diff --git a/tests/sanity/ignore-2.9.txt b/tests/sanity/ignore-2.9.txt index 914cb75c..82f17670 100644 --- a/tests/sanity/ignore-2.9.txt +++ b/tests/sanity/ignore-2.9.txt @@ -107,7 +107,6 @@ plugins/modules/os_volume.py validate-modules:doc-missing-type plugins/modules/os_volume.py validate-modules:parameter-type-not-in-doc plugins/modules/os_volume.py validate-modules:undocumented-parameter plugins/modules/os_volume_snapshot.py validate-modules:doc-missing-type -plugins/modules/os_zone.py validate-modules:doc-choices-do-not-match-spec plugins/modules/os_zone.py validate-modules:doc-missing-type plugins/modules/os_zone.py validate-modules:parameter-type-not-in-doc plugins/doc_fragments/openstack.py future-import-boilerplate