cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 1bbd23e
Date Mon, 31 Aug 2015 09:44:41 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 215a43dfa -> 1bbd23e66


CLOUDSTACK-8725 RVR functionality is broken in case of isolated networks, conntrackd fails
to start.

Rebased with master. This closes #692


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/18dbc0c4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/18dbc0c4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/18dbc0c4

Branch: refs/heads/master
Commit: 18dbc0c4cbe506ad698bc513c901dc2d0e48159f
Parents: 8bc0294
Author: Bharat Kumar <bharat.kumar@citrix.com>
Authored: Thu Aug 13 17:58:15 2015 +0530
Committer: Rajani Karuturi <rajani.karuturi@citrix.com>
Committed: Mon Aug 31 11:54:11 2015 +0530

----------------------------------------------------------------------
 .../patches/debian/config/opt/cloud/bin/cs/CsHelper.py   | 11 +++++++++++
 .../debian/config/opt/cloud/bin/cs/CsRedundant.py        |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/18dbc0c4/systemvm/patches/debian/config/opt/cloud/bin/cs/CsHelper.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsHelper.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsHelper.py
index 3b2488b..64616fb 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsHelper.py
+++ b/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))
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/18dbc0c4/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py
index 64b36c2..da9b887 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py
@@ -96,7 +96,7 @@ class CsRedundant(object):
                 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)


Mime
View raw message