From 2f8352bf967f8b7ee1cac2b2c621c15372eec3d4 Mon Sep 17 00:00:00 2001
From: Ian Southam <isoutham@schubergphilis.com>
Date: Mon, 10 Nov 2014 12:55:05 +0100
Subject: [PATCH] Daft mistake that left more data getting merged than we would
 have liked

---
 .../debian/config/opt/cloud/bin/cs/CsAddress.py       |  2 +-
 systemvm/patches/debian/config/opt/cloud/bin/merge.py | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
index 83900eaf665..00097daec30 100644
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
@@ -304,7 +304,7 @@ class CsIP:
                     logging.error("Not able to setup sourcenat for a regular router yet")
                 else:
                     logging.error("Unable to process source nat configuration for router of type %s" % type)
-        route.flush()
+        #route.flush()
 
     def list(self):
         self.iplist = {}
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/merge.py b/systemvm/patches/debian/config/opt/cloud/bin/merge.py
index 8a3a9785b29..9f8668d5ed5 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/merge.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/merge.py
@@ -18,9 +18,11 @@ from pprint import pprint
 
 class dataBag:
 
-    bdata  = { }
     DPATH = "/etc/cloudstack"
 
+	def __init__(self):
+		self.bdata = { }
+
     def load(self):
         data = self.bdata
         if not os.path.exists(self.DPATH):
@@ -55,13 +57,12 @@ class dataBag:
 
 class updateDataBag:
 
-    qFile = {}
-    fpath = ''
-    bdata  = { }
     DPATH = "/etc/cloudstack"
 
     def __init__(self,qFile):
         self.qFile = qFile
+		self.fpath = ''
+		self.bdata = {}
         self.process()
 
     def process(self):
@@ -79,8 +80,6 @@ class updateDataBag:
           dbag = self.processGuestNetwork(self.db.getDataBag())
        elif self.qFile.type == 'cmdline':
           dbag = self.processCL(self.db.getDataBag())
-       elif self.qFile.type == 'cmdline':
-          dbag = self.processCL(self.db.getDataBag())
        elif self.qFile.type == 'vmpassword':
           dbag = self.processVMpassword(self.db.getDataBag())
        elif self.qFile.type == 'networkacl':