From c338e40070c9cbc9daf54fc6b95adcb57caf694d Mon Sep 17 00:00:00 2001
From: Alexei Znamensky <russoz@gmail.com>
Date: Sun, 29 Nov 2020 00:13:33 +1300
Subject: [PATCH] rolledback removal of parameter from cloud/smartos/vmadm.py

---
 plugins/modules/cloud/smartos/vmadm.py | 4 ++--
 tests/sanity/ignore-2.10.txt           | 2 ++
 tests/sanity/ignore-2.11.txt           | 2 ++
 tests/sanity/ignore-2.9.txt            | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/modules/cloud/smartos/vmadm.py b/plugins/modules/cloud/smartos/vmadm.py
index 66bbfa52e2..59adf96c0d 100644
--- a/plugins/modules/cloud/smartos/vmadm.py
+++ b/plugins/modules/cloud/smartos/vmadm.py
@@ -559,7 +559,7 @@ def create_payload(module, uuid):
     p = module.params
 
     # Filter out the few options that are not valid VM properties.
-    module_options = ['force', 'state']
+    module_options = ['debug', 'force', 'state']
     # @TODO make this a simple {} comprehension as soon as py2 is ditched
     # @TODO {k: v for k, v in p.items() if k not in module_options}
     vmdef = dict([(k, v) for k, v in p.items() if k not in module_options])
@@ -659,7 +659,7 @@ def main():
             'zfs_root_compression', 'zpool'
         ],
         'bool': [
-            'archive_on_delete', 'autoboot', 'delegate_dataset',
+            'archive_on_delete', 'autoboot', 'debug', 'delegate_dataset',
             'docker', 'firewall_enabled', 'force', 'indestructible_delegated',
             'indestructible_zoneroot', 'maintain_resolvers', 'nowait'
         ],
diff --git a/tests/sanity/ignore-2.10.txt b/tests/sanity/ignore-2.10.txt
index 7ff0455b8e..439ac73eda 100644
--- a/tests/sanity/ignore-2.10.txt
+++ b/tests/sanity/ignore-2.10.txt
@@ -188,6 +188,8 @@ plugins/modules/cloud/smartos/imgadm.py validate-modules:doc-missing-type
 plugins/modules/cloud/smartos/imgadm.py validate-modules:no-default-for-required-parameter
 plugins/modules/cloud/smartos/smartos_image_info.py validate-modules:doc-missing-type
 plugins/modules/cloud/smartos/vmadm.py validate-modules:parameter-list-no-elements
+plugins/modules/cloud/smartos/vmadm.py validate-modules:parameter-type-not-in-doc
+plugins/modules/cloud/smartos/vmadm.py validate-modules:undocumented-parameter
 plugins/modules/cloud/softlayer/sl_vm.py validate-modules:parameter-list-no-elements
 plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:doc-default-does-not-match-spec
 plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:doc-missing-type
diff --git a/tests/sanity/ignore-2.11.txt b/tests/sanity/ignore-2.11.txt
index 7ff0455b8e..439ac73eda 100644
--- a/tests/sanity/ignore-2.11.txt
+++ b/tests/sanity/ignore-2.11.txt
@@ -188,6 +188,8 @@ plugins/modules/cloud/smartos/imgadm.py validate-modules:doc-missing-type
 plugins/modules/cloud/smartos/imgadm.py validate-modules:no-default-for-required-parameter
 plugins/modules/cloud/smartos/smartos_image_info.py validate-modules:doc-missing-type
 plugins/modules/cloud/smartos/vmadm.py validate-modules:parameter-list-no-elements
+plugins/modules/cloud/smartos/vmadm.py validate-modules:parameter-type-not-in-doc
+plugins/modules/cloud/smartos/vmadm.py validate-modules:undocumented-parameter
 plugins/modules/cloud/softlayer/sl_vm.py validate-modules:parameter-list-no-elements
 plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:doc-default-does-not-match-spec
 plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:doc-missing-type
diff --git a/tests/sanity/ignore-2.9.txt b/tests/sanity/ignore-2.9.txt
index 4ad3ff8744..d8315da107 100644
--- a/tests/sanity/ignore-2.9.txt
+++ b/tests/sanity/ignore-2.9.txt
@@ -171,6 +171,8 @@ plugins/modules/cloud/scaleway/scaleway_volume_info.py validate-modules:return-s
 plugins/modules/cloud/smartos/imgadm.py validate-modules:doc-missing-type
 plugins/modules/cloud/smartos/imgadm.py validate-modules:no-default-for-required-parameter
 plugins/modules/cloud/smartos/smartos_image_info.py validate-modules:doc-missing-type
+plugins/modules/cloud/smartos/vmadm.py validate-modules:parameter-type-not-in-doc
+plugins/modules/cloud/smartos/vmadm.py validate-modules:undocumented-parameter
 plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:doc-default-does-not-match-spec
 plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:doc-missing-type
 plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:parameter-type-not-in-doc