Skip to content

CLOUDSTACK-8725 RVR functionality is broken in case of isolated netwo…#692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bvbharatk wants to merge 1 commit into from
Closed

CLOUDSTACK-8725 RVR functionality is broken in case of isolated netwo… #692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions systemvm/patches/debian/config/opt/cloud/bin/cs/CsHelper.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 changes: 1 addition & 1 deletion systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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("%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)
CsHelper.copy("%s/%s" % (self.CS_TEMPLATES_DIR, "conntrackd.conf.templ"), self.CONNTRACKD_CONF)

@DaanHooglandDaanHooglandAug 13, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would it make sense to make sure it is marked as needed, or is this always needed (even in non redundant routers)?

@bvbharatkbvbharatkAug 14, 2015

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Daan,

This will be needed only in case of redundant router. The current code tries to copy this file only if it is a rvr. It will not be copied for normal routers.

@DaanHooglandDaanHooglandAug 14, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

then wouldn't the keepalived.conf always be needed as well? the use of copy_if_needed seemed very intentional.

@bvbharatkbvbharatkAug 18, 2015

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Daan,

The intent of copy_if_needed is to prevent overwriting the config file if it is preset already. In case of conntrackd, the config file is already present and so it dose not copy the default cloudstack conntrackd template and as a result conntrackd fails to start. For this(copy_if_needed) to work we should make sure that this file is not present when this code runs for the first time. There may be similar errors related to rvr. I was trying to see if i can address them as a part of larger fix.

CsHelper.copy_if_needed("%s/%s" % (self.CS_TEMPLATES_DIR, "checkrouter.sh.templ"), "/opt/cloud/bin/checkrouter.sh")

CsHelper.execute('sed -i "s/--exec\ \$DAEMON;/--exec\ \$DAEMON\ --\ --vrrp;/g" /etc/init.d/keepalived')
Expand Down