shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-12-22 13:34:07 +03:00
Code Issues Projects Releases Wiki Activity

cli: --cloud-init add network-config option

Browse Source
This commit is contained in:
lisongmin 2021-09-29 23:50:52 +08:00 committed by Cole Robinson
parent fa78a0c3f2
commit 7da5daff92
5 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
man/virt-install.rst
View File

@ -878,6 +878,9 @@ Sub options are:
Specify a public key to inject into the guest, providing ssh access to the
unprivileged account. Example: ssh-key=/home/user/.ssh/id_rsa.pub
``network-config=``
Specify a cloud-init netowrk-config file to add directly to the iso.
``--boot``

4
tests/data/cli/cloudinit/network-config.txt Normal file
View File

@ -0,0 +1,4 @@
version: 2
ethernets:
enp1s0:
dhcp4: true

1
tests/test_cli.py
View File

@ -957,6 +957,7 @@ c.add_compare("--disk %(EXISTIMG1)s --os-variant fedora28 --cloud-init root-pass
c.add_compare("--disk %(EXISTIMG1)s --os-variant fedora28 --cloud-init root-password-file=%(ADMIN-PASSWORD-FILE)s,disable=no", "cloud-init-options") # --cloud-init root-password-file
c.add_compare("--disk %(EXISTIMG1)s --os-variant fedora28 --cloud-init ssh-key=%(XMLDIR)s/cloudinit/ssh-key.txt", "cloud-init-options") # --cloud-init ssh-key
c.add_compare("--disk %(EXISTIMG1)s --os-variant fedora28 --cloud-init user-data=%(XMLDIR)s/cloudinit/user-data.txt,meta-data=%(XMLDIR)s/cloudinit/meta-data.txt", "cloud-init-options") # --cloud-init user-data=,meta-data=
c.add_compare("--disk %(EXISTIMG1)s --os-variant fedora28 --cloud-init user-data=%(XMLDIR)s/cloudinit/user-data.txt,meta-data=%(XMLDIR)s/cloudinit/meta-data.txt,network-config=%(XMLDIR)s/cloudinit/network-config.txt", "cloud-init-options") # --cloud-init user-data=,meta-data=,network-config=
c.add_valid("--panic help --disk=? --check=help", grep="path_in_use") # Make sure introspection doesn't blow up
c.add_valid("--connect test:///default --test-stub-command", use_default_args=False) # --test-stub-command
c.add_valid("--nodisks --pxe", grep="VM performance may suffer") # os variant warning

1
virtinst/cli.py
View File

@ -1756,6 +1756,7 @@ class ParserCloudInit(VirtCLIParser):
cls.add_arg("ssh-key", "ssh_key")
cls.add_arg("user-data", "user_data")
cls.add_arg("meta-data", "meta_data")
cls.add_arg("network-config", "network_config")
def parse_cloud_init(optstr):

18
virtinst/install/cloudinit.py
View File

@ -20,6 +20,7 @@ class CloudInitData():
ssh_key = None
user_data = None
meta_data = None
network_config = None
def _generate_password(self):
if not self.generated_root_password:
@ -91,14 +92,27 @@ def _create_userdata_content(cloudinit_data):
return content
def _create_network_config_content(cloudinit_data):
content = ""
if cloudinit_data.network_config:
log.debug("Using network-config content from path=%s",
cloudinit_data.network_config)
content = open(cloudinit_data.network_config).read()
return content
def create_files(scratchdir, cloudinit_data):
metadata = _create_metadata_content(cloudinit_data)
userdata = _create_userdata_content(cloudinit_data)
datas = [(metadata, "meta-data"), (userdata, "user-data")]
network_config = _create_network_config_content(cloudinit_data)
if network_config:
datas.append((network_config, 'network-config'))
filepairs = []
try:
for content, destfile in [(metadata, "meta-data"),
(userdata, "user-data")]:
for content, destfile in datas:
fileobj = tempfile.NamedTemporaryFile(
prefix="virtinst-", suffix=("-%s" % destfile),
dir=scratchdir, delete=False)