Skip to content

Commit

Permalink
chore: Deprecate partially supported system config (canonical#5515)
Browse files Browse the repository at this point in the history
ds-identify does not support the fs_label key. This key is only partially
supported.

Deprecate it. Users of custom labels may switch to cidata or CIDATA.

Note: Tools such as cloud-localds hard-code the label.
  • Loading branch information
holmanb committed Aug 2, 2024
1 parent d8ce3e2 commit 1c6e81d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
6 changes: 6 additions & 0 deletions cloudinit/sources/DataSourceNoCloud.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,12 @@ def _pp2d_callback(mp, data):

label = self.ds_cfg.get("fs_label", "cidata")
if label is not None:
if label.lower() != "cidata":
util.deprecate(
deprecated="Custom fs_label keys",
deprecated_version="24.3",
extra_message="This key isn't supported by ds-identify.",
)
for dev in self._get_devices(label):
try:
LOG.debug("Attempting to use data from %s", dev)
Expand Down
3 changes: 0 additions & 3 deletions doc/examples/cloud-config-datasources.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ datasource:
# seedfrom: http://my.example.com/i-abcde/
seedfrom: None

# fs_label: the label on filesystems to be searched for NoCloud source
fs_label: cidata

# these are optional, but allow you to basically provide a datasource
# right here
user-data: |
Expand Down

0 comments on commit 1c6e81d

Please sign in to comment.