From e63751ae7c56eaee4270fd7be28fa1312686b8ed Mon Sep 17 00:00:00 2001 From: Clint Byrum Date: Mon, 7 Oct 2013 16:22:56 -0700 Subject: [PATCH] Utilize pypi-mirror from tripleo-cd We want to use the local mirror if we can. Requires I208ac2c316cf76fe928062d8a1c98a02aa1dff1c to be effective but can be merged before it lands. Change-Id: I61e432ad46abd29e332417b19b61d7835d0de772 --- elements/tripleo-cd/element-deps | 1 + elements/tripleo-cd/install.d/10-tripleo-cd | 3 +++ elements/tripleo-cd/tripleo-cd.sh | 1 + 3 files changed, 5 insertions(+) diff --git a/elements/tripleo-cd/element-deps b/elements/tripleo-cd/element-deps index 715c11e2f..429e80e38 100644 --- a/elements/tripleo-cd/element-deps +++ b/elements/tripleo-cd/element-deps @@ -1 +1,2 @@ source-repositories +pypi-mirror diff --git a/elements/tripleo-cd/install.d/10-tripleo-cd b/elements/tripleo-cd/install.d/10-tripleo-cd index aa5cd0c6c..981a70cf6 100755 --- a/elements/tripleo-cd/install.d/10-tripleo-cd +++ b/elements/tripleo-cd/install.d/10-tripleo-cd @@ -37,4 +37,7 @@ else exit 1 fi +mkdir -p ~root/.cache/image-create +ln -s /var/cache/pypi-mirror/pypi ~root/.cache/image-create + install -m 0755 -o root -g root $(dirname $0)/../tripleo-cd.sh /usr/local/bin diff --git a/elements/tripleo-cd/tripleo-cd.sh b/elements/tripleo-cd/tripleo-cd.sh index aaf15e9ea..9440d6e4d 100755 --- a/elements/tripleo-cd/tripleo-cd.sh +++ b/elements/tripleo-cd/tripleo-cd.sh @@ -17,6 +17,7 @@ set -eux +export OVERCLOUD_DIB_EXTRA_ARGS=pypi while true; do source /opt/stack/tripleo-incubator/scripts/refresh-env /opt/stack source /root/stackrc