Skip to content

Commit ab70385

Browse files
committed
Add cloud-init datasources
1 parent 839ae0d commit ab70385

1 file changed

Lines changed: 11 additions & 1 deletion

File tree

coriolis/osmorphing/base.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ def __init__(self, conn, os_root_dir, os_root_dev, hypervisor,
136136
detected_os_info, osmorphing_parameters, operation_timeout)
137137
self._ssh = conn
138138

139+
@property
140+
def datasource_list(self):
141+
return []
142+
139143
@classmethod
140144
def get_required_detected_os_info_fields(cls):
141145
return REQUIRED_DETECTED_OS_FIELDS
@@ -456,7 +460,7 @@ def _configure_cloud_init(self):
456460
cloud_cfg_user_retention = {
457461
'disable_root': False,
458462
'ssh_pwauth': True,
459-
'users': None
463+
'users': []
460464
}
461465
cloud_cfg_mods.update(cloud_cfg_user_retention)
462466
else:
@@ -466,6 +470,12 @@ def _configure_cloud_init(self):
466470
disabled_network_config = {"network": {"config": "disabled"}}
467471
cloud_cfg_mods.update(disabled_network_config)
468472

473+
if self.datasource_list:
474+
datasource_cfg = {'datasource_list': self.datasource_list}
475+
cloud_cfg_mods.update(datasource_cfg)
476+
else:
477+
LOG.warning("No datasource_list passed to cloud-init")
478+
469479
self._write_cloud_init_mods_config(cloud_cfg_mods)
470480

471481
def _test_path_chroot(self, path):

0 commit comments

Comments
 (0)