summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Nečas <necas.marty@gmail.com>2020-03-03 02:12:47 +0100
committerGitHub <noreply@github.com>2020-03-02 17:12:47 -0800
commit6e7383807a2d0726bd7d763d37beaaaf606befeb (patch)
treedd26d6900a04398574cddc3213fb7c4c8b3c3736
parent2376f20bd948d1a04d577705f4473f47d43ae563 (diff)
downloadansible-6e7383807a2d0726bd7d763d37beaaaf606befeb.tar.gz
Ovirt vm deprecated backport (#67923)
* ovirt_vm: remove deprecated warning (#67922) * ovirt_vm: remove deprecated warning of boot params * update docs * add changelog
-rw-r--r--changelogs/fragments/67922-ovirt_vm-remove-deprecation-warning.yml2
-rw-r--r--lib/ansible/modules/cloud/ovirt/ovirt_vm.py15
2 files changed, 2 insertions, 15 deletions
diff --git a/changelogs/fragments/67922-ovirt_vm-remove-deprecation-warning.yml b/changelogs/fragments/67922-ovirt_vm-remove-deprecation-warning.yml
new file mode 100644
index 0000000000..deec39fac8
--- /dev/null
+++ b/changelogs/fragments/67922-ovirt_vm-remove-deprecation-warning.yml
@@ -0,0 +1,2 @@
+minor_changes:
+ - "ovirt_vm: remove deprecated warning of Linux boot parameters"
diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_vm.py b/lib/ansible/modules/cloud/ovirt/ovirt_vm.py
index a905c3468d..457572f6d3 100644
--- a/lib/ansible/modules/cloud/ovirt/ovirt_vm.py
+++ b/lib/ansible/modules/cloud/ovirt/ovirt_vm.py
@@ -522,25 +522,21 @@ options:
description:
- "If I(true) C(kernel_params), C(initrd_path) and C(kernel_path) will persist in virtual machine configuration,
if I(False) it will be used for run once."
- - Usable with oVirt 4.3 and lower; removed in oVirt 4.4.
type: bool
version_added: "2.8"
kernel_path:
description:
- Path to a kernel image used to boot the virtual machine.
- Kernel image must be stored on either the ISO domain or on the host's storage.
- - Usable with oVirt 4.3 and lower; removed in oVirt 4.4.
version_added: "2.3"
initrd_path:
description:
- Path to an initial ramdisk to be used with the kernel specified by C(kernel_path) option.
- Ramdisk image must be stored on either the ISO domain or on the host's storage.
- - Usable with oVirt 4.3 and lower; removed in oVirt 4.4.
version_added: "2.3"
kernel_params:
description:
- Kernel command line parameters (formatted as string) to be used with the kernel specified by C(kernel_path) option.
- - Usable with oVirt 4.3 and lower; removed in oVirt 4.4.
version_added: "2.3"
instance_type:
description:
@@ -1264,7 +1260,6 @@ from ansible.module_utils.ovirt import (
search_by_attributes,
search_by_name,
wait,
- engine_supported,
)
@@ -2271,15 +2266,6 @@ def import_vm(module, connection):
return True
-def check_deprecated_params(module, connection):
- if engine_supported(connection, '4.4') and \
- (module.params.get('kernel_params_persist') is not None or
- module.params.get('kernel_path') is not None or
- module.params.get('initrd_path') is not None or
- module.params.get('kernel_params') is not None):
- module.warn("Parameters 'kernel_params_persist', 'kernel_path', 'initrd_path', 'kernel_params' are not supported since oVirt 4.4.")
-
-
def control_state(vm, vms_service, module):
if vm is None:
return
@@ -2428,7 +2414,6 @@ def main():
state = module.params['state']
auth = module.params.pop('auth')
connection = create_connection(auth)
- check_deprecated_params(module, connection)
vms_service = connection.system_service().vms_service()
vms_module = VmsModule(
connection=connection,