apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Support ConfigDrive with VPC (#10495)

Browse Source
This commit is contained in:
Vishesh 2025-04-16 18:28:17 +05:30 committed by GitHub
parent a09354ddf5
commit 207a2c1da3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/main/java/com/cloud/network/element/ConfigDriveNetworkElement.java
View File

@ -203,8 +203,8 @@ public class ConfigDriveNetworkElement extends AdapterBase implements NetworkEle
private static Map<Service, Map<Capability, String>> setCapabilities() { private static Map<Service, Map<Capability, String>> setCapabilities() {
Map<Service, Map<Capability, String>> capabilities = new HashMap<>(); Map<Service, Map<Capability, String>> capabilities = new HashMap<>();
capabilities.put(Service.UserData, null); capabilities.put(Service.UserData, null);
capabilities.put(Service.Dhcp, new HashMap<>()); capabilities.put(Service.Dhcp, Map.of(Network.Capability.DhcpAccrossMultipleSubnets, "true"));
capabilities.put(Service.Dns, new HashMap<>()); capabilities.put(Service.Dns, Map.of(Capability.AllowDnsSuffixModification, "true"));
return capabilities; return capabilities;
} }
@ -841,7 +841,7 @@ public class ConfigDriveNetworkElement extends AdapterBase implements NetworkEle
public boolean configDhcpSupportForSubnet(Network network, NicProfile nic, VirtualMachineProfile vm, public boolean configDhcpSupportForSubnet(Network network, NicProfile nic, VirtualMachineProfile vm,
DeployDestination dest, DeployDestination dest,
ReservationContext context) throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException { ReservationContext context) throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException {
return false; return true;
} }
@Override @Override

8
ui/src/views/offering/AddVpcOffering.vue
View File

@ -449,12 +449,16 @@ export default {
services.push({ services.push({
name: 'Dhcp', name: 'Dhcp',
provider: [ provider: [
{ name: 'VpcVirtualRouter' } { name: 'VpcVirtualRouter' },
{ name: 'ConfigDrive' }
] ]
}) })
services.push({ services.push({
name: 'Dns', name: 'Dns',
provider: [{ name: 'VpcVirtualRouter' }] provider: [
{ name: 'VpcVirtualRouter' },
{ name: 'ConfigDrive' }
]
}) })
services.push({ services.push({
name: 'Lb', name: 'Lb',