diff --git a/conf/adapter/chef_openstack.conf b/conf/adapter/chef_openstack.conf index 408ddec0..b523815c 100644 --- a/conf/adapter/chef_openstack.conf +++ b/conf/adapter/chef_openstack.conf @@ -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 diff --git a/conf/adapter/os_only.conf b/conf/adapter/os_only.conf index 65ddea3e..96295538 100644 --- a/conf/adapter/os_only.conf +++ b/conf/adapter/os_only.conf @@ -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 diff --git a/install/compass_web.sh b/install/compass_web.sh index a9a97d53..52165aec 100755 --- a/install/compass_web.sh +++ b/install/compass_web.sh @@ -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 diff --git a/install/install.conf.template b/install/install.conf.template index 39f484dc..875fd9ec 100755 --- a/install/install.conf.template +++ b/install/install.conf.template @@ -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}'` diff --git a/install/prepare.sh b/install/prepare.sh index 95b5f62f..ed9e1a97 100755 --- a/install/prepare.sh +++ b/install/prepare.sh @@ -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"