From: QiLiang <liangqi1@huawei.com>
Date: Tue, 12 Jul 2016 11:03:14 +0000 (+0800)
Subject: Improvement: add xenial into make_repo.sh
X-Git-Tag: colorado.1.0~88^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F15%2F16715%2F1;p=compass4nfv.git

Improvement: add xenial into make_repo.sh

JIRA: COMPASS-431

Change-Id: I95d46d4a92923df4f00a0ca48d18ba2e2cd9ed55
Signed-off-by: QiLiang <liangqi1@huawei.com>
---

diff --git a/build/make_repo.sh b/build/make_repo.sh
index d784a627..940b2cea 100755
--- a/build/make_repo.sh
+++ b/build/make_repo.sh
@@ -121,8 +121,14 @@ function make_repo()
         mkdir -p ${WORK_PATH}/work/tmp
         echo "${ansible_dir}"
         cp -rf ${ansible_dir}/roles/ ${WORK_PATH}/work/tmp/
-        if [[ -d ${ansible_dir}/openstack_${package_tag}/roles && "`ls ${ansible_dir}/openstack_${package_tag}`" != "" ]]; then
-            cp -rf ${ansible_dir}/openstack_${package_tag}/roles/* ${WORK_PATH}/work/tmp/roles/
+        if [[ ${os_ver} == xenial ]]; then
+            if [[ -d ${ansible_dir}/openstack_${package_tag}/roles && "`ls ${ansible_dir}/openstack_${package_tag}`" != "" ]]; then
+                cp -rf ${ansible_dir}/openstack_${package_tag}_${os_ver}/roles/* ${WORK_PATH}/work/tmp/roles/
+            fi
+        else
+            if [[ -d ${ansible_dir}/openstack_${package_tag}/roles && "`ls ${ansible_dir}/openstack_${package_tag}`" != "" ]]; then
+                cp -rf ${ansible_dir}/openstack_${package_tag}/roles/* ${WORK_PATH}/work/tmp/roles/
+            fi
         fi
         ansible_dir_tmp=${WORK_PATH}/work/tmp/
     fi