etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 0ee09b3c22 into 5893ba5a8c

This commit is contained in:
Wido den Hollander 2026-05-12 08:17:35 +01:00 committed by GitHub
parent 5893ba5a8c 0ee09b3c22
commit 39fcb1fdc8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
agent/conf/agent.properties
View File

@ -364,6 +364,14 @@ iscsi.session.cleanup.enabled=false
# to the directory "/usr/share/cloudstack-common/".
#network.scripts.dir=scripts/vm/network/vnet
# Sets the VXLAN networking mode used, either 'multicast' (default) or 'evpn'.
# The different modes lead to different scripts being executed by the Agent.
# multicast: modifyvxlan.sh
# evpn: modifyvxlan-evpn.sh
# Existing environments using VXLAN can safely switch to the 'evpn' mode as this
# will not break existing functionality.
#network.vxlan.mode=multicast
# Defines the location for storage scripts.
# The path defined in this property is relative.
# To locate the script, ACS first tries to concatenate

9
agent/src/main/java/com/cloud/agent/properties/AgentProperties.java
View File

@ -304,6 +304,15 @@ public class AgentProperties{
*/
public static final Property<String> NETWORK_BRIDGE_TYPE = new Property<>("network.bridge.type", "native");
/**
* Sets the VXLAN networking mode used by the BridgeVifDriver.<br>
* Possible values: multicast | evpn <br>
* When set to <code>evpn</code>, the driver will use modifyvxlan-evpn.sh instead of modifyvxlan.sh.<br>
* Data type: String.<br>
* Default value: <code>multicast</code>
*/
public static final Property<String> NETWORK_VXLAN_MODE = new Property<>("network.vxlan.mode", "multicast");
/**
* Sets the driver used to plug and unplug NICs from the bridges.<br>
* A sensible default value will be selected based on the network.bridge.type but can be overridden here.<br>

6
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
View File

@ -76,9 +76,11 @@ public class BridgeVifDriver extends VifDriverBase {
if (_modifyVlanPath == null) {
throw new ConfigurationException("Unable to find modifyvlan.sh");
}
_modifyVxlanPath = Script.findScript(networkScriptsDir, "modifyvxlan.sh");
String vxlanMode = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.NETWORK_VXLAN_MODE);
String vxlanScript = "evpn".equalsIgnoreCase(vxlanMode) ? "modifyvxlan-evpn.sh" : "modifyvxlan.sh";
_modifyVxlanPath = Script.findScript(networkScriptsDir, vxlanScript);
if (_modifyVxlanPath == null) {
throw new ConfigurationException("Unable to find modifyvxlan.sh");
throw new ConfigurationException("Unable to find " + vxlanScript);
}
libvirtVersion = (Long) params.get("libvirtVersion");