Skip to content

RbxCloud: Add support for FreeBSD #464

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

Merged
OddBloke merged 4 commits into from
Jun 29, 2020
Merged

RbxCloud: Add support for FreeBSD #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
495ef27
RbxCloud: Add support for FreeBSD
ad-m Jun 25, 2020
4db5060
sources/RbxCloud: Add support for lower case CLOUDMD
ad-m Jun 29, 2020
41d9c74
Merge branch 'master' into rbxcloud-freebsd
OddBloke Jun 29, 2020
3180744
Merge branch 'master' into rbxcloud-freebsd
OddBloke Jun 29, 2020
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
14 changes: 6 additions & 8 deletions cloudinit/sources/DataSourceRbxCloud.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def int2ip(addr):

def _sub_arp(cmd):
"""
Uses the prefered cloud-init subprocess def of subp.subp
Uses the preferred cloud-init subprocess def of subp.subp
and runs arping. Breaking this to a separate function
for later use in mocking and unittests
"""
Expand Down Expand Up @@ -72,17 +72,16 @@ def gratuitous_arp(items, distro):

def get_md():
rbx_data = None
devices = [
dev
for dev, bdata in util.blkid().items()
if bdata.get('LABEL', '').upper() == 'CLOUDMD'
]
devices = set(
util.find_devs_with('LABEL=CLOUDMD') +
util.find_devs_with('LABEL=cloudmd')
)
for device in devices:
try:
rbx_data = util.mount_cb(
device=device,
callback=read_user_data_callback,
mtype=['vfat', 'fat']
mtype=['vfat', 'fat', 'msdosfs']
)
if rbx_data:
break
Expand Down Expand Up @@ -190,7 +189,6 @@ def read_user_data_callback(mount_dir):
'passwd': hash,
'lock_passwd': False,
'ssh_authorized_keys': ssh_keys,
'shell': '/bin/bash'
}
},
'network_config': network,
Expand Down
16 changes: 16 additions & 0 deletions tests/unittests/test_ds_identify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,10 @@ def test_rbx_cloud(self):
"""Rbx datasource has a disk with LABEL=CLOUDMD."""
self._test_ds_found('RbxCloud')

def test_rbx_cloud_lower(self):
"""Rbx datasource has a disk with LABEL=cloudmd."""
self._test_ds_found('RbxCloudLower')

def test_config_drive_upper(self):
"""ConfigDrive datasource has a disk with LABEL=CONFIG-2."""
self._test_ds_found('ConfigDriveUpper')
Expand Down Expand Up @@ -948,6 +952,18 @@ def _print_run_output(rc, out, err, cfg, files):
)},
],
},
'RbxCloudLower': {
'ds': 'RbxCloud',
'mocks': [
{'name': 'blkid', 'ret': 0,
'out': blkid_out(
[{'DEVNAME': 'vda1', 'TYPE': 'vfat', 'PARTUUID': uuid4()},
{'DEVNAME': 'vda2', 'TYPE': 'ext4',
'LABEL': 'cloudimg-rootfs', 'PARTUUID': uuid4()},
{'DEVNAME': 'vdb', 'TYPE': 'vfat', 'LABEL': 'cloudmd'}]
)},
],
},
'Hetzner': {
'ds': 'Hetzner',
'files': {P_SYS_VENDOR: 'Hetzner\n'},
Expand Down