rhtyd closed pull request #2396: CLOUDSTACK-10220: Configure IPv4 alias on VR
regardless of IPv6
URL: https://github.com/apache/cloudstack/pull/2396
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index 9afd642f7ae..cec2e5926c1 100644
---
a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -1306,9 +1306,7 @@ protected boolean prepareElement(final NetworkElement
element, final Network net
if (_networkModel.areServicesSupportedInNetwork(network.getId(),
Service.Dhcp)
&&
_networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.Dhcp,
element.getProvider()) && element instanceof DhcpServiceProvider) {
final DhcpServiceProvider sp = (DhcpServiceProvider)element;
- final Map<Capability, String> dhcpCapabilities =
element.getCapabilities().get(Service.Dhcp);
- final String supportsMultipleSubnets =
dhcpCapabilities.get(Capability.DhcpAccrossMultipleSubnets);
- if (supportsMultipleSubnets != null &&
Boolean.valueOf(supportsMultipleSubnets) && profile.getIPv6Address() == null) {
+ if (isDhcpAccrossMultipleSubnetsSupported(sp)) {
if (!sp.configDhcpSupportForSubnet(network, profile,
vmProfile, dest, context)) {
return false;
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
