Skip to content

Add cloud init datasources #373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Cristi1324 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add cloud init datasources #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion coriolis/osmorphing/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ def __init__(self, conn, os_root_dir, os_root_dev, hypervisor,
detected_os_info, osmorphing_parameters, operation_timeout)
self._ssh = conn

@property
def datasource_list(self):
return []

@classmethod
def get_required_detected_os_info_fields(cls):
return REQUIRED_DETECTED_OS_FIELDS
Expand Down Expand Up @@ -459,7 +463,7 @@ def _configure_cloud_init(self):
cloud_cfg_user_retention = {
'disable_root': False,
'ssh_pwauth': True,
'users': None
'users': []
}
cloud_cfg_mods.update(cloud_cfg_user_retention)
else:
Expand All @@ -469,6 +473,12 @@ def _configure_cloud_init(self):
disabled_network_config = {"network": {"config": "disabled"}}
cloud_cfg_mods.update(disabled_network_config)

if self.datasource_list:
datasource_cfg = {'datasource_list': self.datasource_list}
cloud_cfg_mods.update(datasource_cfg)
else:
LOG.warning("No datasource_list passed to cloud-init")

self._write_cloud_init_mods_config(cloud_cfg_mods)

if self._has_systemd_chroot():
Expand Down
25 changes: 22 additions & 3 deletions coriolis/tests/osmorphing/test_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,31 +710,45 @@ def test__create_cloudinit_user_already_exists(

@ddt.data(
(
None,
["vim"],
{},
False,
None,
False
),
(
["Oracle"],
["cloud-init"],
{"retain_user_credentials": True, "set_dhcp": False},
False,
{
"disable_root": False,
"ssh_pwauth": True,
"users": None,
"users": [],
"network": {"config": "disabled"},
"datasource_list": ["Oracle"]
},
True
),
(
[],
["cloud-init", "vim"],
{"retain_user_credentials": False, "set_dhcp": True},
True,
{},
False
),
(
["ConfigDrive", "OpenStack"],
["cloud-init", "vim"],
{"retain_user_credentials": False, "set_dhcp": True},
True,
{
"datasource_list": ["ConfigDrive", "OpenStack"]
},
False
),
)
@ddt.unpack
@mock.patch.object(base.BaseLinuxOSMorphingTools,
Expand All @@ -749,14 +763,19 @@ def test__create_cloudinit_user_already_exists(
@mock.patch.object(base.BaseLinuxOSMorphingTools,
'_disable_installer_cloud_config')
@mock.patch.object(base.BaseLinuxOSMorphingTools, 'get_packages')
@mock.patch.object(base.BaseLinuxOSMorphingTools, 'datasource_list',
new_callable=mock.PropertyMock)
def test__configure_cloud_init(
self, returned_packages, osmorphing_params, creates_cloudinit_user,
expected_result, has_systemd_chroot, mock_get_packages,
self, datasource_list, returned_packages, osmorphing_params,
creates_cloudinit_user, expected_result, has_systemd_chroot,
mock_datasource_list, mock_get_packages,
mock__disable_installer_cloud_config,
mock__ensure_cloud_init_not_disabled, mock__reset_cloud_init_run,
mock__create_cloudinit_user, mock__write_cloud_init_mods_config,
mock__has_systemd_chroot, mock__enable_systemd_service
):
if datasource_list is not None:
mock_datasource_list.return_value = datasource_list
mock_get_packages.return_value = returned_packages
self.os_morphing_tools._osmorphing_parameters = osmorphing_params
mock__has_systemd_chroot.return_value = has_systemd_chroot
Expand Down