commit f0b9e841c4a8171a0389d61a81b58f858ef0a546
author Jenkins <jenkins@review.openstack.org> Fri Feb 03 16:23:14 2017 +0000
committer Gerrit Code Review <review@openstack.org> Fri Feb 03 16:23:14 2017 +0000
tree fe72cdb4e9c3399ab01e36527b57799ea0ad33a3
parent debc695ddfc8b7b2aeb53c01c624e15f69ed9fa2
parent ba3c8f48bb07707e421f1c5aac5acedd1e63d3fd

Merge "Change the way to get conntrack-tools version"

tools/xen/functions

diff --git a/tools/xen/functions b/tools/xen/functions
index e1864eb..93f3413 100644
--- a/tools/xen/functions
+++ b/tools/xen/functions
@@ -317,7 +317,7 @@
         # Only support conntrack-tools in Dom0 with XS7.0 and above
         if [ ! -f /usr/sbin/conntrackd ]; then
             sed -i s/#baseurl=/baseurl=/g /etc/yum.repos.d/CentOS-Base.repo
-            centos_ver=$(yum version nogroups |grep Installed | cut -d' ' -f 2 | cut -d'.' -f1-2 | tr '-' '.')
+            centos_ver=$(yum version nogroups |grep Installed | cut -d' ' -f 2 | cut -d'/' -f 1 | cut -d'-' -f 1)
             yum install -y --enablerepo=base --releasever=$centos_ver conntrack-tools
             # Backup conntrackd.conf after install conntrack-tools, use the one with statistic mode
             mv /etc/conntrackd/conntrackd.conf /etc/conntrackd/conntrackd.conf.back