Merge pull request #763 from karuturi/pr/692-rebase

CLOUDSTACK-8725 RVR functionality is broken in case of isolated networksconntrackd fails to start.

Rebased with master. This closes #692

* pr/763:
  CLOUDSTACK-8725 RVR functionality is broken in case of isolated networks, conntrackd fails to start.

Signed-off-by: Rajani Karuturi <rajani.karuturi@citrix.com>

Author: karuturi

systemvm/patches/debian/config/opt/cloud/bin/cs/CsHelper.py

@@ -219,3 +219,14 @@ def copy_if_needed(src, dest):
         logging.Error("Could not copy %s to %s" % (src, dest))
     else:
         logging.info("Copied %s to %s" % (src, dest))
+
+def copy(src, dest):
+    """
+    copy source to destination.
+    """
+    try:
+        shutil.copy2(src, dest)
+    except IOError:
+        logging.Error("Could not copy %s to %s" % (src, dest))
+    else:
+        logging.info("Copied %s to %s" % (src, dest))

systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py

@@ -96,7 +96,7 @@ def _redundant_on(self):
                 d = s.replace(".templ", "")
             CsHelper.copy_if_needed(
                 "%s/%s" % (self.CS_TEMPLATES_DIR, s), "%s/%s" % (self.CS_ROUTER_DIR, d))
-        CsHelper.copy_if_needed(
+        CsHelper.copy(
             "%s/%s" % (self.CS_TEMPLATES_DIR, "keepalived.conf.templ"), self.KEEPALIVED_CONF)
         CsHelper.copy_if_needed(
             "%s/%s" % (self.CS_TEMPLATES_DIR, "conntrackd.conf.templ"), self.CONNTRACKD_CONF)