DaanHoogland commented on code in PR #9163:
URL: https://github.com/apache/cloudstack/pull/9163#discussion_r1624124783
##########
engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java:
##########
@@ -87,6 +87,20 @@ public interface VirtualMachineManager extends Manager {
ConfigKey<String> MetadataCustomCloudName = new ConfigKey<>("Advanced",
String.class, "metadata.custom.cloud.name", "",
"If provided, a custom cloud-name in cloud-init metadata", true,
ConfigKey.Scope.Zone);
+ ConfigKey<String> VmMetadataManufacturer = new ConfigKey<>("Advanced",
String.class,
+ "vm.metadata.manufacturer", "",
+ "If provided, a custom manufacturer will be used in the instance
metadata. When an empty" +
+ "value is set then default manufacturer will be 'Apache
Software Foundation'. " +
+ "A custom manufacturer may break cloud-init functionality
with CloudStack datasource. Please " +
+ "refer documentation", true, ConfigKey.Scope.Zone);
+ ConfigKey<String> VmMetadataProductName = new ConfigKey<>("Advanced",
String.class,
+ "vm.metadata.product", "",
+ "If provided, a custom product name will be used in the instance
metadata. When an empty" +
+ "value is set then default product name will be
'CloudStack <HYPERVISIOR_NAME> Hypervisor'. " +
+ "A custom product name may break cloud-init functionality
with CloudStack datasource. Please " +
+ "refer documentation",
+ true, ConfigKey.Scope.Zone);
+
Review Comment:
can we encode the defaults in these configkeys? (at least in the first one,
i can see how the second would complicate things.)
##########
engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java:
##########
@@ -1262,6 +1262,8 @@ public void orchestrateStart(final String vmUuid, final
Map<VirtualMachineProfil
vmGuru.finalizeVirtualMachineProfile(vmProfile, dest, ctx);
final VirtualMachineTO vmTO = hvGuru.implement(vmProfile);
+
vmTO.setMetadataManufacturer(VmMetadataManufacturer.valueIn(vm.getDataCenterId()));
+
vmTO.setMetadataProductName(VmMetadataProductName.valueIn(vm.getDataCenterId()));
Review Comment:
the check would be here.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
