From 0e5b1b3048fed3da3fe26428e9e704ebb4b5aa74 Mon Sep 17 00:00:00 2001 From: Athina Plaskasoviti Date: Wed, 3 Jul 2019 08:37:03 +0300 Subject: [PATCH] cloudinit: Clean up create_metadata and create_userdata functions from unused/unwanted arguments Signed-off-by: Athina Plaskasoviti --- virtinst/install/cloudinit.py | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/virtinst/install/cloudinit.py b/virtinst/install/cloudinit.py index 06ffdabbe..a27762b70 100644 --- a/virtinst/install/cloudinit.py +++ b/virtinst/install/cloudinit.py @@ -10,31 +10,21 @@ class CloudInitData(): root_password = None -def create_metadata(scratchdir, hostname=None): - if hostname: - instance = hostname - else: - hostname = instance = "localhost" - content = 'instance-id: %s\n' % instance - content += 'hostname: %s\n' % hostname - log.debug("Generated cloud-init metadata:\n%s", content) - +def create_metadata(scratchdir): fileobj = tempfile.NamedTemporaryFile( prefix="virtinst-", suffix="-metadata", dir=scratchdir, delete=False) filename = fileobj.name + content = "" with open(filename, "w") as f: f.write(content) + log.debug("Generated cloud-init metadata\n%s", content) return filename -def create_userdata(scratchdir, cloudinit_data, username=None, password=None): +def create_userdata(scratchdir, cloudinit_data): content = "#cloud-config\n" - if username: - content += "name: %s\n" % username - if password: - content += "password: %s\n" % password rootpass = cloudinit_data.root_password if rootpass == "generate":