Skip to content

Commit 207a2c1

Browse files
authored
Support ConfigDrive with VPC (#10495)
1 parent a09354d commit 207a2c1

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

server/src/main/java/com/cloud/network/element/ConfigDriveNetworkElement.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@ public Map<Service, Map<Capability, String>> getCapabilities() {
203203
private static Map<Service, Map<Capability, String>> setCapabilities() {
204204
Map<Service, Map<Capability, String>> capabilities = new HashMap<>();
205205
capabilities.put(Service.UserData, null);
206-
capabilities.put(Service.Dhcp, new HashMap<>());
207-
capabilities.put(Service.Dns, new HashMap<>());
206+
capabilities.put(Service.Dhcp, Map.of(Network.Capability.DhcpAccrossMultipleSubnets, "true"));
207+
capabilities.put(Service.Dns, Map.of(Capability.AllowDnsSuffixModification, "true"));
208208
return capabilities;
209209
}
210210

@@ -841,7 +841,7 @@ public boolean addDhcpEntry(Network network, NicProfile nic, VirtualMachineProfi
841841
public boolean configDhcpSupportForSubnet(Network network, NicProfile nic, VirtualMachineProfile vm,
842842
DeployDestination dest,
843843
ReservationContext context) throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException {
844-
return false;
844+
return true;
845845
}
846846

847847
@Override

ui/src/views/offering/AddVpcOffering.vue

+6-2
Original file line numberDiff line numberDiff line change
@@ -449,12 +449,16 @@ export default {
449449
services.push({
450450
name: 'Dhcp',
451451
provider: [
452-
{ name: 'VpcVirtualRouter' }
452+
{ name: 'VpcVirtualRouter' },
453+
{ name: 'ConfigDrive' }
453454
]
454455
})
455456
services.push({
456457
name: 'Dns',
457-
provider: [{ name: 'VpcVirtualRouter' }]
458+
provider: [
459+
{ name: 'VpcVirtualRouter' },
460+
{ name: 'ConfigDrive' }
461+
]
458462
})
459463
services.push({
460464
name: 'Lb',

0 commit comments

Comments
 (0)