2022-11-04 18:04:31 +01:00
|
|
|
Subject: virt-install: --unattended and --cloud-init conflict
|
|
|
|
|
From: Cole Robinson crobinso@redhat.com Sun Aug 21 16:47:26 2022 -0400
|
|
|
|
|
Date: Sun Aug 21 16:47:26 2022 -0400:
|
|
|
|
|
Git: 999ccb85e3e4189386786256cdf70cf5238cf785
|
|
|
|
|
|
|
|
|
|
Make it an explicit error, otherwise unattended is preferred and
|
|
|
|
|
cloud-init is ignored
|
|
|
|
|
|
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=2117157
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
|
|
|
|
|
|
|
|
|
--- a/tests/test_cli.py
|
|
|
|
|
+++ b/tests/test_cli.py
|
2022-11-28 20:35:30 +01:00
|
|
|
@@ -1116,6 +1116,7 @@ c.add_invalid("--disk none --boot networ
|
2022-11-04 18:04:31 +01:00
|
|
|
c.add_invalid("--nodisks --boot network --arch mips --virt-type kvm", grep="any virtualization options for architecture 'mips'")
|
|
|
|
|
c.add_invalid("--nodisks --boot network --paravirt --arch mips", grep=" 'xen' for architecture 'mips'")
|
|
|
|
|
c.add_invalid("--osinfo generic --launchSecurity sev --connect " + utils.URIs.kvm_amd_sev, grep="SEV launch security requires a Q35 UEFI machine")
|
|
|
|
|
+c.add_invalid("--disk none --cloud-init --unattended --install fedora30", grep="--unattended and --cloud-init can not")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
--- a/virtinst/virtinstall.py
|
|
|
|
|
+++ b/virtinst/virtinstall.py
|
|
|
|
|
@@ -407,6 +407,9 @@ def build_installer(options, guest, inst
|
|
|
|
|
else:
|
|
|
|
|
extra_args = [installdata.kernel_args]
|
|
|
|
|
|
|
|
|
|
+ if options.unattended and options.cloud_init:
|
|
|
|
|
+ fail("--unattended and --cloud-init can not be specified together.")
|
|
|
|
|
+
|
|
|
|
|
if options.unattended:
|
|
|
|
|
unattended_data = cli.parse_unattended(options.unattended)
|
|
|
|
|
|
