Updated Branches: refs/heads/4.2 efd6dd494 -> 34fecbf5e
CLOUDSTACK-4784: 22x to 4.x upgrade - don't ignore redundant router network offering, when update ntwk_offering_serivce_map with PF/StaticNat/SourceNat services Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/34fecbf5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/34fecbf5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/34fecbf5 Branch: refs/heads/4.2 Commit: 34fecbf5e2b8af9251e016df70fa4063c33fcbb3 Parents: efd6dd4 Author: Alena Prokharchyk <alena.prokharc...@citrix.com> Authored: Wed Oct 2 11:09:44 2013 -0700 Committer: Alena Prokharchyk <alena.prokharc...@citrix.com> Committed: Wed Oct 9 15:17:21 2013 -0700 ---------------------------------------------------------------------- engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/34fecbf5/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java index 78ee674..48b83b4 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java @@ -663,7 +663,7 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade { services.put("SecurityGroup", "SecurityGroupProvider"); } - if (uniqueName.equals(NetworkOffering.DefaultIsolatedNetworkOfferingWithSourceNatService.toString()) || uniqueName.equalsIgnoreCase(externalOfferingName)) { + if (uniqueName.equals(NetworkOffering.DefaultIsolatedNetworkOfferingWithSourceNatService.toString()) || uniqueName.equals(NetworkOffering.DefaultIsolatedNetworkOfferingWithSourceNatService.toString() + "-redundant") || uniqueName.equalsIgnoreCase(externalOfferingName)) { if (externalOfferingName != null && uniqueName.equalsIgnoreCase(externalOfferingName)) { services.put("SourceNat", "JuniperSRX"); services.put("PortForwarding", "JuniperSRX");
