diff options
| author |   shuai chen <chenshuai@huawei.com> | 2016-07-12 09:36:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-12 09:36:29 +0000 |
| commit | 387c7d93e552ec586f9401aa37de8d56ad10b6dd (patch) | |
| tree | 778caab983d78cfcfe06e0c33053a10e92f347bd | |
| parent | af6aea87c0795acd29d5c5fcbd2fadf40b15f6f5 (diff) | |
| parent | 3d362af32e3bc50cbd329d86dfe2b93983ced601 (diff) | |
Merge "Improvement: add xenial into make_repo.sh"
| -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 |