From e2cec702becd49b0914b93fc1684442e4161c45f Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 8 Nov 2016 12:05:11 -0500 Subject: [PATCH] Support all 3 repos for UCA mirrors We incorrectly setup our mirrors for UCA. Now we support 3 openstack releases. Change-Id: Ie3a05398d9fdc7a7f7c0c74366a7c4dd70200a2b Signed-off-by: Paul Belanger --- nodepool/scripts/configure_mirror.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/nodepool/scripts/configure_mirror.sh b/nodepool/scripts/configure_mirror.sh index 41a46ef970..2029f096e3 100755 --- a/nodepool/scripts/configure_mirror.sh +++ b/nodepool/scripts/configure_mirror.sh @@ -90,7 +90,9 @@ deb $NODEPOOL_UBUNTU_MIRROR $LSBDISTCODENAME-security main universe" CEPH_SOURCES_LIST="deb $NODEPOOL_CEPH_MIRROR $LSBDISTCODENAME main" -UCA_SOURCES_LIST="deb $NODEPOOL_UCA_MIRROR $LSBDISTCODENAME-updates main" +UCA_SOURCES_LIST_LIBERTY="deb $NODEPOOL_UCA_MIRROR trusty-updates/liberty main" +UCA_SOURCES_LIST_MITAKA="deb $NODEPOOL_UCA_MIRROR trusty-updates/mitaka main" +UCA_SOURCES_LIST_NEWTON="deb $NODEPOOL_UCA_MIRROR xenial-updates/newton main" APT_CONF_UNAUTHENTICATED="APT::Get::AllowUnauthenticated \"true\";" @@ -173,8 +175,14 @@ if [ "$LSBDISTID" == "Ubuntu" ] && [ "$LSBDISTCODENAME" != 'precise' ]; then sudo mv /tmp/ceph-deb-hammer.list /etc/apt/sources.list.available.d/ # Ubuntu Cloud Archive - echo "$UCA_SOURCES_LIST" >/tmp/ubuntu-cloud-archive.list - sudo mv /tmp/ubuntu-cloud-archive.list /etc/apt/sources.list.available.d/ + echo "$UCA_SOURCES_LIST_LIBERTY" >/tmp/ubuntu-cloud-archive-liberty.list + sudo mv /tmp/ubuntu-cloud-archive-liberty.list /etc/apt/sources.list.available.d/ + + echo "$UCA_SOURCES_LIST_MITAKA" >/tmp/ubuntu-cloud-archive-mitaka.list + sudo mv /tmp/ubuntu-cloud-archive-mitaka.list /etc/apt/sources.list.available.d/ + + echo "$UCA_SOURCES_LIST_NEWTON" >/tmp/ubuntu-cloud-archive-newton.list + sudo mv /tmp/ubuntu-cloud-archive-newton.list /etc/apt/sources.list.available.d/ sudo chown root:root /etc/apt/sources.list.available.d/* sudo chmod 0644 /etc/apt/sources.list.available.d/*