diff options
| author |   shuai chen <chenshuai@huawei.com> | 2016-05-24 09:04:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-05-24 09:04:11 +0000 |
| commit | d145e106f192df2772a3c73f661243530c1f5bf3 (patch) | |
| tree | 498179a727a4029ea30ec089ad897e237a82c6ba | |
| parent | 2ca5561d0b0b1a913cca24c1571a612f381ea018 (diff) | |
| parent | 5d40016071b782e281f74cb5180ef5098331bf09 (diff) | |
Merge "Update build and make_repo script for Mitaka_trusty"
| -rwxr-xr-x | build.sh | 8 | ||||
| -rwxr-xr-x | build/make_repo.sh | 6 |
2 files changed, 7 insertions, 7 deletions
@@ -78,7 +78,7 @@ function download_local() function download_packages() { - for i in $CENTOS_BASE $COMPASS_CORE $COMPASS_WEB $COMPASS_INSTALL $TRUSTY_JUNO_PPA $TRUSTY_LIBERTY_PPA $UBUNTU_ISO \ + for i in $CENTOS_BASE $COMPASS_CORE $COMPASS_WEB $COMPASS_INSTALL $TRUSTY_JUNO_PPA $TRUSTY_LIBERTY_PPA $TRUSTY_MITAKA_PPA $UBUNTU_ISO \ $CENTOS_ISO $CENTOS7_JUNO_PPA $CENTOS7_KILO_PPA $CENTOS7_LIBERTY_PPA $LOADERS $CIRROS $APP_PACKAGE $COMPASS_PKG \ $PIP_REPO $ANSIBLE_MODULE; do @@ -120,9 +120,9 @@ function copy_file() cp $CACHE_DIR/`basename $TRUSTY_LIBERTY_PPA` $new/repos/cobbler/ubuntu/ppa/ -rf fi -# if [[ $TRUSTY_MITAKA_PPA ]]; then -# cp $CACHE_DIR/`basename $TRUSTY_MITAKA_PPA` $new/repos/cobbler/ubuntu/ppa/ -rf -# fi + if [[ $TRUSTY_MITAKA_PPA ]]; then + cp $CACHE_DIR/`basename $TRUSTY_MITAKA_PPA` $new/repos/cobbler/ubuntu/ppa/ -rf + fi if [[ $CENTOS_ISO ]]; then cp $CACHE_DIR/`basename $CENTOS_ISO` $new/repos/cobbler/centos/iso/ -rf diff --git a/build/make_repo.sh b/build/make_repo.sh index bebb5060..4299868c 100755 --- a/build/make_repo.sh +++ b/build/make_repo.sh @@ -117,9 +117,9 @@ 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} && "`ls ${ansible_dir}/openstack_${package_tag}`" != "" ]]; then - cp -rf ${ansible_dir}/openstack_${package_tag}/* ${WORK_PATH}/work/tmp/roles/ - fi + 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 ansible_dir_tmp=${WORK_PATH}/work/tmp/ fi |