diff options
| author |   shuai chen <chenshuai@huawei.com> | 2015-11-16 15:43:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-11-16 15:43:26 +0000 |
| commit | c3eb0aa24e4c4697f446f69b86a9cb159734e5f2 (patch) | |
| tree | 1cb47bdd2f5b7788092213a08ac7319a99df2898 /build.sh | |
| parent | a8aa85f2a26256938b0057802ac5521edb594791 (diff) | |
| parent | cb5ae68b968f28c1cedee3720ff14cf5fa1ab92c (diff) | |
Merge "suport installing openstack kilo on centos 7"
Diffstat (limited to 'build.sh')
| -rwxr-xr-x | build.sh | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -65,7 +65,8 @@ function download_local() function download_packages() { for i in $CENTOS_BASE $COMPASS_CORE $COMPASS_WEB $COMPASS_INSTALL $TRUSTY_JUNO_PPA $UBUNTU_ISO \ - $CENTOS_ISO $CENTOS7_JUNO_PPA $LOADERS $CIRROS $APP_PACKAGE $COMPASS_PKG $PIP_REPO $ANSIBLE_MODULE; do + $CENTOS_ISO $CENTOS7_JUNO_PPA $CENTOS7_KILO_PPA $LOADERS $CIRROS $APP_PACKAGE $COMPASS_PKG \ + $PIP_REPO $ANSIBLE_MODULE; do if [[ ! $i ]]; then continue @@ -111,6 +112,10 @@ function copy_file() cp $CACHE_DIR/`basename $CENTOS7_JUNO_PPA` $new/repos/cobbler/centos/ppa/ -rf fi + if [[ $CENTOS7_KILO_PPA ]]; then + cp $CACHE_DIR/`basename $CENTOS7_KILO_PPA` $new/repos/cobbler/centos/ppa/ -rf + fi + cp $CACHE_DIR/`basename $LOADERS` $new/ -rf || exit 1 cp $CACHE_DIR/`basename $APP_PACKAGE` $new/app_packages/ -rf || exit 1 cp $CACHE_DIR/`basename $ANSIBLE_MODULE | sed 's/.git//g'` $new/ansible/ -rf || exit 1 |