This is an automated email from the ASF dual-hosted git repository. pearl11594 pushed a commit to branch netris-update-vpc-and-tier-names in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 5289fe4b625a4aa2ace45d13b6f29166d46e3095 Author: Nicolas Vazquez <[email protected]> AuthorDate: Wed Feb 5 12:13:13 2025 -0300 Keep Vpn service to default VPC offering with Natted mode only (#50) * Add Vpn service to default VPC offering with Routed mode * Revert change on VPC offering and fix VPN service only for Netris NAT mode --- server/src/main/java/com/cloud/server/ConfigurationServerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java index 782734c8c8b..33b8db99bb3 100644 --- a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java @@ -1255,7 +1255,6 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio serviceProviderMap.put(Service.Dhcp, routerProvider); serviceProviderMap.put(Service.Dns, routerProvider); serviceProviderMap.put(Service.UserData, routerProvider); - serviceProviderMap.put(Service.Vpn, routerProvider); if (forVpc) { serviceProviderMap.put(Service.NetworkACL, provider); } else { @@ -1266,6 +1265,9 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio serviceProviderMap.put(Service.StaticNat, provider); serviceProviderMap.put(Service.PortForwarding, provider); serviceProviderMap.put(Service.Lb, provider); + if (provider == Provider.Netris) { + serviceProviderMap.put(Service.Vpn, routerProvider); + } } return serviceProviderMap; }
