diff options
| author |   QiLiang <liangqi1@huawei.com> | 2016-07-12 19:03:14 +0800 |
|---|---|---|
| committer | QiLiang <liangqi1@huawei.com> | 2016-07-12 19:05:07 +0800 |
| commit | 3d362af32e3bc50cbd329d86dfe2b93983ced601 (patch) | |
| tree | 3615dfa9749735fbad0d4203d60537699f699b23 | |
| parent | 0ba2eae35870882223eb3381d2e397427bc90743 (diff) | |
Improvement: add xenial into make_repo.sh
JIRA: COMPASS-431
Change-Id: I95d46d4a92923df4f00a0ca48d18ba2e2cd9ed55
Signed-off-by: QiLiang <liangqi1@huawei.com>
| -rwxr-xr-x | build/make_repo.sh | 10 |
1 files changed, 8 insertions, 2 deletions
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 |