mirror of https://github.com/apache/cloudstack.git
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
This commit is contained in:
parent
427d7328c1
commit
5289fe4b62
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue