x/compass-core
Code Issues Proposed changes

remove unused local repo download

Browse Source 
Change-Id: I4ad43d9b6b864ec3e631a3ebb9fb5998053c9835
This commit is contained in:
xiaodongwang 2015-01-23 16:49:35 -08:00
parent 189af9ddc7
commit 91c349350f
5 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/adapter/chef_openstack.conf
View File

@ -3,5 +3,5 @@ DISPLAY_NAME = 'OpenStack Icehouse'
PARENT = 'openstack'
PACKAGE_INSTALLER = 'chef_installer'
OS_INSTALLER = 'cobbler'
SUPPORTED_OS_PATTERNS = ['(?i)centos-6\.5.*', '(?i)ubuntu-12\.04.*']
SUPPORTED_OS_PATTERNS = ['(?i)centos.*', '(?i)ubuntu.*']
DEPLOYABLE = True

2
conf/adapter/os_only.conf
View File

@ -1,5 +1,5 @@
NAME = 'os_only'
PARENT = 'general'
OS_INSTALLER = 'cobbler'
SUPPORTED_OS_PATTERNS = ['(?i)centos-6\.5.*', '(?i)ubuntu-12\.04.*']
SUPPORTED_OS_PATTERNS = ['(?i)centos.*', '(?i)ubuntu.*']
DEPLOYABLE = True

7
install/compass_web.sh
View File

@ -21,13 +21,6 @@ sudo cp -rf $WEB_HOME/v2 /var/www/compass_web/
if [[ $LOCAL_REPO = "y" ]]; then
echo "setting up local repo"
mkdir -p /tmp/repo
download -u "${LOCAL_REPO_US}/local_repo.tar.gz" -u "${LOCAL_REPO_HUAWEI}/local_repo.tar.gz" local_repo.tar.gz unzip /tmp/repo || exit $?
mv -f /tmp/repo/local_repo/* /var/www/compass_web/v2/
if [[ "$?" != "0" ]]; then
echo "failed to setup local repo"
exit 1
fi
download -u "${LOCAL_REPO_US}/gem_repo.tar.gz" -u "${LOCAL_REPO_HUAWEI}/gem_repo.tar.gz" gem_repo.tar.gz unzip /var/www/compass_web/v2 || exit $?
download -u "${LOCAL_REPO_US}/cirros-0.3.2-x86_64-disk.img" -u "${LOCAL_REPO_HUAWEI}/cirros-0.3.2-x86_64-disk.img" cirros-0.3.2-x86_64-disk.img copy /var/www/compass_web/v2 || exit $?
if [[ $SUPPORT_CENTOS_6_5 = "y" ]]; then

6
install/install.conf.template
View File

@ -17,10 +17,10 @@ export NIC=installation
export LOCAL_REPO=${LOCAL_REPO:-"y"}
export SUPPORT_CENTOS_6_5=${SUPPORT_CENTOS_6_5:-"y"}
export SUPPORT_CENTOS_6_6=${SUPPORT_CENTOS_6_6:-"n"}
export SUPPORT_CENTOS_7_0=${SUPPORT_CENTOS_7_0:-"n"}
export SUPPORT_CENTOS_6_6=${SUPPORT_CENTOS_6_6:-"y"}
export SUPPORT_CENTOS_7_0=${SUPPORT_CENTOS_7_0:-"y"}
export SUPPORT_UBUNTU_12_04=${SUPPORT_UBUNTU_12_04:-"y"}
export SUPPORT_UBUNTU_14_04=${SUPPORT_UBUNTU_14_04:-"n"}
export SUPPORT_UBUNTU_14_04=${SUPPORT_UBUNTU_14_04:-"y"}
# DHCP config
export IPADDR=`ifconfig $NIC | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}'`

2
install/prepare.sh
View File

@ -288,8 +288,6 @@ fi
# download local repo
if [[ $LOCAL_REPO == "y" ]]; then
echo "download local repo"
download -u "${LOCAL_REPO_US}/local_repo.tar.gz" -u "${LOCAL_REPO_HUAWEI}/local_repo.tar.gz" || exit $?
echo "download gem local repo"
download -u "${LOCAL_REPO_US}/gem_repo.tar.gz" -u "${LOCAL_REPO_HUAWEI}/gem_repo.tar.gz" || exit $?
echo "download openstack os image local repo"