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

CLOUDSTACK-8406: Fixed selecting userdata as VR with dhcp service

Browse Source
This commit is contained in:
Jayapal 2015-04-30 12:21:15 +05:30
parent 0bd0a5ec5b
commit 4b2ce34bc9
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -3923,6 +3923,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
Map<Provider, Set<Service>> providerCombinationToVerify = new HashMap<Provider, Set<Service>>(); Map<Provider, Set<Service>> providerCombinationToVerify = new HashMap<Provider, Set<Service>>();
Map<String, List<String>> svcPrv = cmd.getServiceProviders(); Map<String, List<String>> svcPrv = cmd.getServiceProviders();
Provider firewallProvider = null; Provider firewallProvider = null;
Provider dhcpProvider = null;
Boolean IsVrUserdataProvider = false;
if (svcPrv != null) { if (svcPrv != null) {
for (String serviceStr : svcPrv.keySet()) { for (String serviceStr : svcPrv.keySet()) {
Network.Service service = Network.Service.getService(serviceStr); Network.Service service = Network.Service.getService(serviceStr);
@ -3952,6 +3954,14 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
firewallProvider = Provider.VirtualRouter; firewallProvider = Provider.VirtualRouter;
} }
if (service == Service.Dhcp) {
dhcpProvider = provider;
}
if (service == Service.UserData && provider == Provider.VirtualRouter) {
IsVrUserdataProvider = true;
}
providers.add(provider); providers.add(provider);
Set<Service> serviceSet = null; Set<Service> serviceSet = null;
@ -3971,6 +3981,12 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
} }
} }
// dhcp provider and userdata provider should be same because vm will be contacting dhcp server for user data.
if (dhcpProvider == null && IsVrUserdataProvider) {
s_logger.debug("User data provider VR can't be selected without VR as dhcp provider. In this case VM fails to contact the DHCP server for userdata");
throw new InvalidParameterValueException("Without VR as dhcp provider, User data can't selected for VR. Please select VR as DHCP provider ");
}
// validate providers combination here // validate providers combination here
_networkModel.canProviderSupportServices(providerCombinationToVerify); _networkModel.canProviderSupportServices(providerCombinationToVerify);