Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/virt-install b/virt-install
- index ee2b9006..1be0b91c 100755
- --- a/virt-install
- +++ b/virt-install
- @@ -399,6 +399,7 @@ def build_installer(options, guest, installdata):
- install_kernel_args = installdata.kernel_args
- install_os = installdata.os
- no_install = installdata.no_install
- + is_cloud = installdata.is_cloud
- if installdata.kernel_args:
- if installdata.kernel_args_overwrite:
- install_kernel_args = installdata.kernel_args
- @@ -433,7 +434,8 @@ def build_installer(options, guest, installdata):
- install_kernel=install_kernel,
- install_initrd=install_initrd,
- install_kernel_args=install_kernel_args,
- - no_install=no_install)
- + no_install=no_install,
- + is_cloud=is_cloud)
- if options.unattended:
- unattended_data = cli.parse_unattended(options.unattended)
- diff --git a/virtinst/cli.py b/virtinst/cli.py
- index 9a1fe2f6..a2a501a5 100644
- --- a/virtinst/cli.py
- +++ b/virtinst/cli.py
- @@ -1580,6 +1580,7 @@ class ParserInstall(VirtCLIParser):
- is_onoff=True)
- cls.add_arg("os", "os")
- cls.add_arg("no_install", "no_install", is_onoff=True)
- + cls.add_arg("is_cloud", "is_cloud", is_onoff=True)
- class InstallData:
- @@ -1592,6 +1593,7 @@ class InstallData:
- self.os = None
- self.is_set = False
- self.no_install = None
- + self.is_cloud = None
- def parse_install(optstr):
- diff --git a/virtinst/install/installer.py b/virtinst/install/installer.py
- index f20ef376..348c248d 100644
- --- a/virtinst/install/installer.py
- +++ b/virtinst/install/installer.py
- @@ -50,7 +50,7 @@ class Installer(object):
- def __init__(self, conn, cdrom=None, location=None, install_bootdev=None,
- location_kernel=None, location_initrd=None,
- install_kernel=None, install_initrd=None, install_kernel_args=None,
- - no_install=None):
- + no_install=None, is_cloud=None):
- self.conn = conn
- # Entry point for virt-manager 'Customize' wizard to change autostart
- @@ -64,6 +64,7 @@ class Installer(object):
- self._install_bootdev = install_bootdev
- self._no_install = no_install
- + self._is_cloud = None
- self._treemedia = None
- self._treemedia_bootconfig = None
- @@ -267,7 +268,8 @@ class Installer(object):
- elif unattended_script:
- self._prepare_unattended_data(guest, unattended_script)
- - elif guest.devices.disk[0].path.endswith("cloud.qcow2"):
- + elif self.cdrom and self._is_cloud:
- + #elif guest.devices.disk[0].path.endswith("cloud.qcow2"):
- metadata = "meta-data"
- userdata = "user-data"
- create_metadata(metadata)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
