Refactor cloud init config #364

Cristi1324 · 2025-08-13T14:34:28Z

No description provided.

Dany9966 · 2025-08-14T09:54:23Z

coriolis/osmorphing/debian.py

        return yaml.dump(cfg, default_flow_style=False)

+    def _has_systemd_chroot(self):
+        if self._test_path("/lib/systemd/system"):


Why not just return self._test_path('/lib/systemd/system')? :D

coriolis/osmorphing/redhat.py

Dany9966 · 2025-08-14T10:11:30Z

coriolis/osmorphing/base.py

+        cloud_cfg_path = 'etc/cloud/cloud.cfg'
+        if not self._test_path(cloud_cfg_path):
+            return DEFAULT_CLOUD_USER
+        cloud_cfg_content = self._read_file(cloud_cfg_path)


Please use _read_file_sudo here.

coriolis/osmorphing/base.py

Dany9966 · 2025-08-14T10:21:11Z

coriolis/osmorphing/base.py

+        self._ensure_cloud_init_enabled()
+        self._reset_cloud_init_run()
+        if self._osmorphing_parameters.get('retain_user_credentials', False):
+            self._configure_cloud_init_user_retention()


This method overwrites cloud.cfg. I'd like to add those mods into a separate file called 99_coriolis.cfg inside cloud.cfg.d. Save them inside a cloud_cfg_mods and only at the end of this _configure_cloud_init method you'd write that file.
Also, here is what the set_dhcp mods should also be included.

Dany9966

Mostly LGTM, just a couple of nits

Dany9966 · 2025-08-25T10:15:06Z

coriolis/osmorphing/base.py

+                'ssh_pwauth': True,
+                'users': None
+            }
+            cloud_cfg_mods = {**cloud_cfg_mods,


NIT: I think it's cleaner if you use update()

Suggested change

cloud_cfg_mods = {**cloud_cfg_mods,

cloud_cfg_mods.update(cloud_cfg_user_retention)

Dany9966 · 2025-08-25T10:16:52Z

coriolis/osmorphing/base.py

+
+        if not self._osmorphing_parameters.get('set_dhcp', False):
+            disabled_network_config = {"network": {"config": "disabled"}}
+            cloud_cfg_mods = {**cloud_cfg_mods, **disabled_network_config}


Same as above

Dany9966 · 2025-09-02T06:06:32Z

LGTM. Please update tests as well. Feel free to open up the PR as well

Dany9966 · 2025-09-02T06:11:17Z

coriolis/osmorphing/base.py

-                    cloud_cfg_path))
-                continue
+            "Configuring cloud-init additional options")
+        new_cloud_cfg = yaml.dump(cloud_cfg)


Please always use safe loaders and dumpers when using yaml module.
I.E.: yaml.load(content, Loader=yaml.SafeLoader)

Suggested change

new_cloud_cfg = yaml.dump(cloud_cfg)

new_cloud_cfg = yaml.dump(cloud_cfg. Dumper=yaml.SafeDumper)

Dany9966 · 2025-09-02T06:15:09Z

coriolis/osmorphing/base.py

-                LOG.warn("Could not find %s. Skipping reconfiguration." % (
-                    cloud_cfg_path))
-                continue
+            "Configuring cloud-init additional options")


NIT: I think this sounds better

Suggested change

"Configuring cloud-init additional options")

"Customizing cloud-init configuration")

Dany9966 · 2025-09-02T06:16:55Z

coriolis/osmorphing/base.py

-                    cloud_cfg_paths.append("%s/%s" % (cloud_cfgs_dir, path))
-
+        if not self._test_path(cloud_cfgs_dir):
+            exception.CoriolisException("Could not find %s" % cloud_cfgs_dir)


I think it'd be better to just create this directory instead of straight out erroring out. Cloud-init will look for this location regardless, it's not customizable afaik. (if it is, find a way to locate it)
At least execute: mkdir -p /etc/cloud/cloud.cfg.d

Dany9966 · 2025-09-02T06:17:46Z

coriolis/osmorphing/base.py

+        installer_config_path = "/etc/cloud/cloud.cfg.d/99-installer.cfg"
+        if self._test_path(installer_config_path):
+            self._event_manager.progress_update(
+                "Disabling Ubuntu installer-generated cloud-config")


Since this is in base now, I think you should drop the Ubuntu

Dany9966 · 2025-09-02T06:32:39Z

coriolis/osmorphing/base.py

+            self._exec_cmd_chroot(f"rm {disabler_file}")
+        if self._test_path(system_conf_disabler):
+            self._exec_cmd_chroot(
+                "sed -i '/cloud-init=disabled/d' %s" % system_conf_disabler)


I'm not sure this will work as you expect it, it could just leave an empty variable and maybe even bork the system.conf file. If you haven't already, please do a test and see if it gets enabled and systemd doesn't just fall on its head.
Let me know if you already tested this and it works.

coriolis/osmorphing/base.py

Dany9966 · 2025-09-02T06:46:54Z

coriolis/osmorphing/base.py

+        else:
+            self._create_cloudinit_user()
+
+        if not self._osmorphing_parameters.get('set_dhcp', False):


Please set set_dhcp's default to True. Otherwise, in providers where we do not support this option, it will always disable cloud-init networking.

Suggested change

if not self._osmorphing_parameters.get('set_dhcp', False):

if not self._osmorphing_parameters.get('set_dhcp', True):

Dany9966 · 2025-09-02T06:49:12Z

coriolis/osmorphing/redhat.py

+            package_names
+        )


NIT:

Suggested change

package_names

)

package_names)

Dany9966 · 2025-09-02T06:50:30Z

coriolis/osmorphing/suse.py

+        self._run_dracut()
+        self._configure_cloud_init()


NIT for consistency's sake:

Suggested change

self._run_dracut()

self._configure_cloud_init()

self._configure_cloud_init()

self._run_dracut()

Dany9966 · 2025-09-04T16:25:23Z

LGTM. Please update tests. Feel free to open up the PR as well

coriolis/osmorphing/base.py

Cristi1324 force-pushed the refactor-cloud-init branch from b892b9d to 175c87e Compare August 13, 2025 14:41

Dany9966 reviewed Aug 14, 2025

View reviewed changes

Cristi1324 force-pushed the refactor-cloud-init branch 3 times, most recently from c698ff2 to 9219663 Compare August 22, 2025 10:58

Dany9966 reviewed Aug 25, 2025

View reviewed changes

Cristi1324 force-pushed the refactor-cloud-init branch from 9219663 to 07eba4e Compare August 26, 2025 10:22

Dany9966 requested changes Sep 2, 2025

View reviewed changes

Cristi1324 force-pushed the refactor-cloud-init branch from 07eba4e to 0cc1819 Compare September 4, 2025 14:37

Refactor cloud-init config into core

2223d26

Cristi1324 force-pushed the refactor-cloud-init branch from 0cc1819 to 2223d26 Compare September 17, 2025 12:35

Cristi1324 marked this pull request as ready for review September 17, 2025 12:54

Cristi1324 changed the title ~~[WIP] Refactor cloud init config~~ Refactor cloud init config Sep 17, 2025

Dany9966 reviewed Oct 15, 2025

View reviewed changes

coriolis/osmorphing/base.py Show resolved Hide resolved

Update osmorphing unit tests

b0f1425

Cristi1324 force-pushed the refactor-cloud-init branch from 17f248a to b0f1425 Compare October 16, 2025 09:46

Dany9966 approved these changes Oct 24, 2025

View reviewed changes

Dany9966 merged commit 839ae0d into cloudbase:master Oct 24, 2025
4 checks passed

	cloud_cfg_mods = {**cloud_cfg_mods,
	cloud_cfg_mods.update(cloud_cfg_user_retention)

	new_cloud_cfg = yaml.dump(cloud_cfg)
	new_cloud_cfg = yaml.dump(cloud_cfg. Dumper=yaml.SafeDumper)

	"Configuring cloud-init additional options")
	"Customizing cloud-init configuration")

	if not self._osmorphing_parameters.get('set_dhcp', False):
	if not self._osmorphing_parameters.get('set_dhcp', True):

Refactor cloud init config #364

Refactor cloud init config #364

Conversation

Cristi1324 commented Aug 13, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Dany9966 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Dany9966 commented Sep 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Dany9966 commented Sep 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Dany9966 commented Sep 2, 2025 •

edited

Loading

Dany9966 commented Sep 4, 2025 •

edited

Loading