apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Rajani Karuturi 2015-08-31 15:13:29 +05:30
commit 1bbd23e664
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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))

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

@ -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)