From 92169083f87ef298441974a02be7e631c65acea5 Mon Sep 17 00:00:00 2001 From: baigk Date: Mon, 4 Jan 2016 10:11:29 +0800 Subject: [PATCH] add pip repo for deployment machines download pip packages and create pip repo for deployment machines Change-Id: Iefb2cad65970c845ddc728895bbdef4002d72f7f Signed-off-by: baigk --- install/compass.sh | 3 +++ install/install.conf | 9 +++++---- misc/apache/http_pip.conf | 9 +++++++++ 3 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 misc/apache/http_pip.conf diff --git a/install/compass.sh b/install/compass.sh index 895df3a9..0ecfafd2 100755 --- a/install/compass.sh +++ b/install/compass.sh @@ -27,6 +27,7 @@ sudo mkdir -p /var/www/compass sudo rm -rf /var/www/compass/* sudo cp -rf $COMPASSDIR/misc/apache/ods-server.conf /etc/httpd/conf.d/ods-server.conf +sudo cp -rf $COMPASSDIR/misc/apache/http_pip.conf /etc/httpd/conf.d/http_pip.conf sudo cp -rf $COMPASSDIR/conf/* /etc/compass/ sudo cp -rf $COMPASSDIR/service/* /etc/init.d/ sudo cp -rf $COMPASSDIR/bin/*.py /opt/compass/bin/ @@ -55,6 +56,8 @@ if [ ! -f /usr/lib64/libcrypto.so ]; then sudo cp -rf /usr/lib64/libcrypto.so.6 /usr/lib64/libcrypto.so fi +download -u "$PIP_PACKAGES" `basename $PIP_PACKAGES` unzip /var/www/ || exit $? + sudo mkdir -p /opt/compass/db sudo chmod -R 777 /opt/compass/db sudo chmod -R 777 /var/log/compass diff --git a/install/install.conf b/install/install.conf index 61c804b3..a072a12f 100755 --- a/install/install.conf +++ b/install/install.conf @@ -51,10 +51,11 @@ export IMAGE_VERSION=${IMAGE_VERSION:-"${IMAGE_VERSION_MAJOR}.${IMAGE_VERSION_MI export IMAGE_NAME=${IMAGE_NAME:-"${IMAGE_TYPE}-${IMAGE_VERSION}"} export IMAGE_ARCH=${IMAGE_ARCH:-"x86_64"} -export CENTOS_7_2_IMAGE_SOURCE=${CENTOS_7_2_IMAGE_SOURCE:-"http://205.177.226.235:9999/CentOS-7-x86_64-Minimal-1511.iso"} -export UBUNTU_14_04_03_IMAGE_SOURCE=${UBUNTU_14_04_03_IMAGE_SOURCE:-"http://205.177.226.235:9999/ubuntu-14.04.3-server-amd64.iso"} -export CENTOS_7_2_PPA_REPO_SOURCE=${CENTOS_7_2_PPA_REPO_SOURCE:-"http://205.177.226.235:9999/centos7-juno-ppa.tar.gz"} -export UBUNTU_14_04_03_PPA_REPO_SOURCE=${UBUNTU_14_04_03_PPA_REPO_SOURCE:-"http://205.177.226.235:9999/trusty-liberty-ppa.tar.gz"} +export CENTOS_7_2_IMAGE_SOURCE=${CENTOS_7_2_IMAGE_SOURCE:-"http://205.177.226.237:9999/CentOS-7-x86_64-Minimal-1511.iso"} +export UBUNTU_14_04_03_IMAGE_SOURCE=${UBUNTU_14_04_03_IMAGE_SOURCE:-"http://205.177.226.237:9999/ubuntu-14.04.3-server-amd64.iso"} +export CENTOS_7_2_PPA_REPO_SOURCE=${CENTOS_7_2_PPA_REPO_SOURCE:-"http://205.177.226.237:9999/centos7-juno-ppa.tar.gz"} +export UBUNTU_14_04_03_PPA_REPO_SOURCE=${UBUNTU_14_04_03_PPA_REPO_SOURCE:-"http://205.177.226.237:9999/trusty-liberty-ppa.tar.gz"} +export PIP_PACKAGES=${PIP_PACKAGES:-"http://205.177.226.237:9999/pip.tar.gz"} export COBBLER_PASSWORD=${COBBLER_PASSWORD:-"cobbler"} diff --git a/misc/apache/http_pip.conf b/misc/apache/http_pip.conf new file mode 100644 index 00000000..9a61de25 --- /dev/null +++ b/misc/apache/http_pip.conf @@ -0,0 +1,9 @@ +Alias /pip /var/www/pip + + + SetEnv VIRTUALENV + Options Indexes FollowSymLinks + Order allow,deny + Allow from all + +