summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHuan Xie <huan.xie@citrix.com>2017-05-03 03:36:55 -0700
committerHuan Xie <huan.xie@citrix.com>2017-05-09 18:11:46 -0700
commitdce4954d10d49c692304f6b45877e90b7ed4d0c0 (patch)
tree817af954e8bb1e299ffafa41b51172dc96f9d03e
parent6689a9f9c98e1336bd98b26636846ea42044957b (diff)
Check conntrack backup log in Dom0HEADmaster
When enable conntrack-tools, we will change the conntrackd.conf file, but there is an error, current code is checking the DomU to see whether the backup file exist, however this check should in Dom0, this patch is to fix this problem Change-Id: Ib9de2a2707785b04b38173e1d3bccadfa11b753e
Notes
Notes (review): Code-Review+2: Jianghua Wang <jianghua.wang@citrix.com> Verified+1: Citrix XenServer CI Code-Review+2: Bob Ball <bob.ball@citrix.com> Workflow+1: Bob Ball <bob.ball@citrix.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 10 May 2017 10:19:34 +0000 Reviewed-on: https://review.openstack.org/462079 Project: openstack/fuel-plugin-xenserver Branch: refs/heads/master
-rwxr-xr-xplugin_source/deployment_scripts/compute_post_deployment.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/plugin_source/deployment_scripts/compute_post_deployment.py b/plugin_source/deployment_scripts/compute_post_deployment.py
index 7ba11f4..598e72e 100755
--- a/plugin_source/deployment_scripts/compute_post_deployment.py
+++ b/plugin_source/deployment_scripts/compute_post_deployment.py
@@ -456,7 +456,11 @@ def check_and_setup_ceilometer(himn, username, password):
456 456
457def enable_conntrack_service(himn, username): 457def enable_conntrack_service(himn, username):
458 # use conntrack statistic mode, so change conntrackd.conf 458 # use conntrack statistic mode, so change conntrackd.conf
459 if not os.path.exists('/etc/conntrackd/conntrackd.conf.back'): 459 errcode, out, err = utils.ssh_detailed(
460 himn, username, 'ls', '/etc/conntrackd/conntrackd.conf.back',
461 allowed_return_codes=[0, 2])
462 if errcode == 2:
463 # Only make conntrackd.conf.back if it doesn't exist
460 utils.ssh(himn, username, 464 utils.ssh(himn, username,
461 'mv', 465 'mv',
462 '/etc/conntrackd/conntrackd.conf', 466 '/etc/conntrackd/conntrackd.conf',