openstack
/
fuel-main
Code Issues Proposed changes

ubuntu: use security updates APT repository 

Mirantis mirror has a separate APT repository with security updates instead
of the common ${ubuntu_release}-updates component (which is assumed by apt
and friends). Use that repository when building the ISO with USE_MIRROR=none

DocImpact
blueprint support-ubuntu-trusty
Change-Id: Ib43c015ed953c80a73a8269168cc4d3f89b08e7a
This commit is contained in:
Alexei Sheplyakov 2014-12-01 13:07:18 +03:00
parent af85b38ff9
commit a9e0429446
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.mk
View File

@ -221,6 +221,11 @@ MIRROR_CENTOS_KERNEL?=http://mirror.centos.org/centos-6/6.6/
MIRROR_CENTOS_OS_BASEURL:=$(MIRROR_CENTOS)/os/$(CENTOS_ARCH)
MIRROR_CENTOS_KERNEL_BASEURL?=$(MIRROR_CENTOS_KERNEL)/os/$(CENTOS_ARCH)
MIRROR_UBUNTU?=http://mirrors-local-msk.msk.mirantis.net/ubuntu-$(PRODUCT_VERSION)/
# Unfortunately security updates are handled in a manner incompatible with
# Debian/Ubuntu. That is, instead of having ${UBUNTU_RELEASE}-updates
# directory there's a different APT repo with security updates residing
# in ${UBUNTU_RELEASE}/main
MIRROR_UBUNTU_SECURITY?=http://mirrors-local-msk.msk.mirantis.net/ubuntu-security-$(PRODUCT_VERSION)/
MIRROR_UBUNTU_OS_BASEURL:=$(MIRROR_UBUNTU)
MIRROR_DOCKER?=http://mirror.fuel-infra.org/fwm/$(PRODUCT_VERSION)/docker
MIRROR_DOCKER_BASEURL:=$(MIRROR_DOCKER)

9
mirror/ubuntu/createchroot.mk
View File

@ -18,6 +18,7 @@ $(BUILD_DIR)/mirror/ubuntu/createchroot.done:
cp $(SOURCE_DIR)/mirror/ubuntu/multistrap.conf $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/
sed -i $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/multistrap.conf \
-e 's|@@MIRROR_UBUNTU@@|$(MIRROR_UBUNTU)|g' \
-e 's|@@MIRROR_UBUNTU_SECURITY@@|$(MIRROR_UBUNTU_SECURITY)|g' \
-e 's|@@MIRROR_FUEL_UBUNTU@@|$(MIRROR_FUEL_UBUNTU)|g' \
-e 's|@@UBUNTU_RELEASE@@|$(UBUNTU_RELEASE)|g' \
-e 's|@@UBUNTU_RELEASE_NUMBER@@|$(UBUNTU_RELEASE_NUMBER)|g'
@ -68,9 +69,11 @@ endif
sudo rm -f $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/chroot/etc/apt/sources.list.d/*.list
echo deb $(MIRROR_UBUNTU) $(UBUNTU_RELEASE) main | sudo tee $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/chroot/etc/apt/sources.list.d/ubuntu.list
if [ "$(USE_MIRROR)" = "none" ]; then \
echo deb $(MIRROR_UBUNTU) $(UBUNTU_RELEASE) universe multiverse restricted | sudo tee -a $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/chroot/etc/apt/sources.list.d/ubuntu.list; \
echo deb $(MIRROR_UBUNTU) $(UBUNTU_RELEASE)-updates main universe multiverse restricted | sudo tee -a $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/chroot/etc/apt/sources.list.d/ubuntu.list; \
echo deb $(MIRROR_UBUNTU) $(UBUNTU_RELEASE)-security main universe multiverse restricted | sudo tee -a $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/chroot/etc/apt/sources.list.d/ubuntu.list; \
ubuntu_lst="$(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/chroot/etc/apt/sources.list.d/ubuntu.list"; \
echo deb $(MIRROR_UBUNTU) $(UBUNTU_RELEASE) universe multiverse restricted | sudo tee -a "$$ubuntu_lst"; \
echo deb $(MIRROR_UBUNTU) $(UBUNTU_RELEASE)-updates main universe multiverse restricted | sudo tee -a "$$ubuntu_lst"; \
echo deb $(MIRROR_UBUNTU) $(UBUNTU_RELEASE)-security main universe multiverse restricted | sudo tee -a "$$ubuntu_lst"; \
echo deb $(MIRROR_UBUNTU_SECURITY) $(UBUNTU_RELEASE)-security main universe multiverse restricted | sudo tee -a "$$ubuntu_lst"; \
echo deb $(MIRROR_FUEL_UBUNTU) $(UBUNTU_RELEASE) main | sudo tee $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/chroot/etc/apt/sources.list.d/mirantis.list; \
fi
echo 'APT::Get::AllowUnauthenticated 1;' | sudo tee $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/chroot/etc/apt/apt.conf.d/02mirantis-unauthenticated

5
mirror/ubuntu/multistrap.conf
View File

@ -53,5 +53,10 @@ source=@@MIRROR_FUEL_UBUNTU@@
suite=@@UBUNTU_RELEASE@@
omitdebsrc=true
[MirantisSecurity]
source=@@MIRROR_UBUNTU_SECURITY@@
suite=@@UBUNTU_RELEASE@@-security
omitdebsrc=true
#endif