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

Author: nvazquez

server/src/main/java/com/cloud/server/ConfigurationServerImpl.java

@@ -1255,7 +1255,6 @@ private Map<Service, Provider> getServicesAndProvidersForProviderNetwork(Network
         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 @@ private Map<Service, Provider> getServicesAndProvidersForProviderNetwork(Network
             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;
     }