From e5571480d4e9eef39e1b0a23c65b6442ce774577 Mon Sep 17 00:00:00 2001
From: kishan <kishan@cloud.com>
Date: Thu, 19 Apr 2012 21:57:37 +0530
Subject: [PATCH] bug CS-14566: set up physical networks before encrypting
 config values status CS-14566: resolved fixed reviewed-by: Nitin

---
 server/src/com/cloud/upgrade/dao/Upgrade2214to30.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java b/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
index 7517941c9aa..9c61c373de1 100755
--- a/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
+++ b/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
@@ -62,14 +62,14 @@ public class Upgrade2214to30 implements DbUpgrade {
 
     @Override
     public void performDataMigration(Connection conn) {
+    	// physical network setup
+        setupPhysicalNetworks(conn);
         // encrypt data
         encryptData(conn);
         // drop keys
         dropKeysIfExist(conn);
         //update templete ID for system Vms
         updateSystemVms(conn);
-        // physical network setup
-        setupPhysicalNetworks(conn);
         // update domain network ref
         updateDomainNetworkRef(conn);
         // update networks that use redundant routers to the new network offering