Updated Branches: refs/heads/4.3 78b9d5cda -> 88ce5b804 refs/heads/master 79dc74dcb -> 700184f3b
Added config to enable/disable router version check Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/700184f3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/700184f3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/700184f3 Branch: refs/heads/master Commit: 700184f3ba270be7a493d088990d8791ce80206d Parents: 79dc74d Author: Kishan Kavala <kis...@cloud.com> Authored: Wed Jan 1 17:32:00 2014 +0530 Committer: Kishan Kavala <kis...@cloud.com> Committed: Wed Jan 1 17:32:00 2014 +0530 ---------------------------------------------------------------------- .../router/VirtualNetworkApplianceManagerImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/700184f3/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index ee412b3..8904185 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -665,6 +665,10 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V static final ConfigKey<Boolean> UseExternalDnsServers = new ConfigKey<Boolean>(Boolean.class, "use.external.dns", "Advanced", "false", "Bypass internal dns, use external dns1 and dns2", true, ConfigKey.Scope.Zone, null); + static final ConfigKey<Boolean> routerVersionCheckEnabled = new ConfigKey<Boolean>("Advanced", Boolean.class, "router.version.check", "true", + "If true, router minimum required version is checked before sending command", false); + + @Override public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException { @@ -4156,6 +4160,10 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V //Checks if the router is at the required version // Compares MS version and router version private boolean checkRouterVersion(VirtualRouter router){ + if(!routerVersionCheckEnabled.value()){ + //Router version check is disabled. + return true; + } if(router.getTemplateVersion() == null){ return false; } @@ -4198,6 +4206,6 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V @Override public ConfigKey<?>[] getConfigKeys() { - return new ConfigKey<?>[] {UseExternalDnsServers}; + return new ConfigKey<?>[] {UseExternalDnsServers, routerVersionCheckEnabled}; } }
