Skip to content

Commit

Permalink
chore(VMware): Modify section of instance-id in the customization con…
Browse files Browse the repository at this point in the history
…fig (#5356)

For the traditional guest os customization, there is no instance-id provided in the customization
configuration. While since the next vSphere release, instance-id will be provided and included
in the traditional guest os customization configuration for the first time, the format is
"MISC|INSTANCE-ID".
This change is correcting the config parser and related test.
  • Loading branch information
PengpengSun authored Jun 11, 2024
1 parent bbc72bf commit fdc2505
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cloudinit/sources/helpers/vmware/imc/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class Config:
DEFAULT_RUN_POST_SCRIPT = "MISC|DEFAULT-RUN-POST-CUST-SCRIPT"
CLOUDINIT_META_DATA = "CLOUDINIT|METADATA"
CLOUDINIT_USER_DATA = "CLOUDINIT|USERDATA"
CLOUDINIT_INSTANCE_ID = "CLOUDINIT|INSTANCE-ID"
CLOUDINIT_INSTANCE_ID = "MISC|INSTANCE-ID"

def __init__(self, configFile):
self._configFile = configFile
Expand Down
4 changes: 2 additions & 2 deletions tests/data/vmware/cust-dhcp-2nic-instance-id.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ SUFFIX|1 = eng.vmware.com
TIMEZONE = Africa/Abidjan
UTC = yes

[CLOUDINIT]
INSTANCE-ID = guest-os-customization-uuid
[MISC]
INSTANCE-ID = 50078779-0bc7-1a57-7c52-1179f03f5650

0 comments on commit fdc2505

Please sign in to comment.