openstack/openstack-helm
Code Issues Proposed changes

Libvirt: Fix image

Browse Source 
This PS fixes the libvirt image, buy removing the ubuntu-cloud
archive repo and pinning to a good version.

Change-Id: I5097d8893b92d020f7a5a1cb5925dec0b01d4da2
Signed-off-by: Pete Birley <pete@port.direct>
This commit is contained in:
Pete Birley 2018-10-05 15:41:12 -05:00
parent 26e1b9cde6
commit f8880d27ad
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libvirt/values.yaml
View File

@ -27,7 +27,7 @@ labels:
images: images:
tags: tags:
libvirt: docker.io/openstackhelm/libvirt:ubuntu-xenial-ocata libvirt: docker.io/openstackhelm/libvirt:ubuntu-xenial-1.3.1-1ubuntu10.24
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
image_repo_sync: docker.io/docker:17.07.0 image_repo_sync: docker.io/docker:17.07.0
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"

6
tools/images/libvirt/Dockerfile.ubuntu.xenial
View File

@ -1,7 +1,7 @@
FROM docker.io/ubuntu:xenial FROM docker.io/ubuntu:xenial
MAINTAINER pete.birley@att.com MAINTAINER pete.birley@att.com
ARG TARGET_OPENSTACK_VERSION=ocata ARG LIBVIRT_VERSION=ocata
ARG CEPH_RELEASE=luminous ARG CEPH_RELEASE=luminous
ARG PROJECT=nova ARG PROJECT=nova
ARG UID=42424 ARG UID=42424
@ -13,8 +13,6 @@ RUN set -ex ;\
apt-key add /etc/apt/ceph-release.asc ;\ apt-key add /etc/apt/ceph-release.asc ;\
rm -f /etc/apt/ceph-release.asc ;\ rm -f /etc/apt/ceph-release.asc ;\
echo "deb http://download.ceph.com/debian-${CEPH_RELEASE}/ xenial main" | tee /etc/apt/sources.list.d/ceph.list ;\ echo "deb http://download.ceph.com/debian-${CEPH_RELEASE}/ xenial main" | tee /etc/apt/sources.list.d/ceph.list ;\
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5EDB1B62EC4926EA ;\
echo "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${TARGET_OPENSTACK_VERSION} main" | tee /etc/apt/sources.list.d/cloud-archive.list ;\
apt-get update ;\ apt-get update ;\
apt-get upgrade -y ;\ apt-get upgrade -y ;\
apt-get install --no-install-recommends -y \ apt-get install --no-install-recommends -y \
@ -23,7 +21,7 @@ RUN set -ex ;\
dmidecode \ dmidecode \
ebtables \ ebtables \
iproute2 \ iproute2 \
libvirt-bin \ libvirt-bin=${LIBVIRT_VERSION} \
pm-utils \ pm-utils \
qemu \ qemu \
qemu-block-extra \ qemu-block-extra \

6
tools/images/libvirt/Makefile
View File

@ -15,7 +15,7 @@
# It's necessary to set this because some environments don't link sh -> bash. # It's necessary to set this because some environments don't link sh -> bash.
SHELL := /bin/bash SHELL := /bin/bash
TARGET_OPENSTACK_VERSION ?= ocata LIBVIRT_VERSION ?= 1.3.1-1ubuntu10.24
DISTRO ?= ubuntu DISTRO ?= ubuntu
DISTRO_RELEASE ?= xenial DISTRO_RELEASE ?= xenial
CEPH_RELEASE ?= luminous CEPH_RELEASE ?= luminous
@ -23,7 +23,7 @@ CEPH_RELEASE ?= luminous
DOCKER_REGISTRY ?= docker.io DOCKER_REGISTRY ?= docker.io
IMAGE_NAME ?= libvirt IMAGE_NAME ?= libvirt
IMAGE_PREFIX ?= openstackhelm IMAGE_PREFIX ?= openstackhelm
IMAGE_TAG ?= $(DISTRO)-$(DISTRO_RELEASE)-$(TARGET_OPENSTACK_VERSION) IMAGE_TAG ?= $(DISTRO)-$(DISTRO_RELEASE)-$(LIBVIRT_VERSION)
LABEL ?= putlabelshere LABEL ?= putlabelshere
IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG} IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
@ -39,7 +39,7 @@ build_$(IMAGE_NAME):
--network=host \ --network=host \
--force-rm \ --force-rm \
--file=./Dockerfile.${DISTRO}.xenial \ --file=./Dockerfile.${DISTRO}.xenial \
--build-arg TARGET_OPENSTACK_VERSION="${TARGET_OPENSTACK_VERSION}" \ --build-arg LIBVIRT_VERSION="${LIBVIRT_VERSION}" \
--build-arg CEPH_RELEASE="${CEPH_RELEASE}" \ --build-arg CEPH_RELEASE="${CEPH_RELEASE}" \
--label $(LABEL) \ --label $(LABEL) \
-t $(IMAGE) \ -t $(IMAGE) \

8
tools/images/libvirt/README.rst
View File

@ -30,7 +30,7 @@ repo run:
.. code:: bash .. code:: bash
TARGET_OPENSTACK_VERSION=ocata LIBVIRT_VERSION=1.3.1-1ubuntu10.24
DISTRO=ubuntu DISTRO=ubuntu
DISTRO_RELEASE=xenial DISTRO_RELEASE=xenial
CEPH_RELEASE=luminous CEPH_RELEASE=luminous
@ -41,8 +41,8 @@ repo run:
--pull \ --pull \
--no-cache \ --no-cache \
--file=./tools/images/libvirt/Dockerfile.${DISTRO}.xenial \ --file=./tools/images/libvirt/Dockerfile.${DISTRO}.xenial \
--build-arg TARGET_OPENSTACK_VERSION="${TARGET_OPENSTACK_VERSION}" \ --build-arg LIBVIRT_VERSION="${LIBVIRT_VERSION}" \
--build-arg CEPH_RELEASE="${CEPH_RELEASE}" \ --build-arg CEPH_RELEASE="${CEPH_RELEASE}" \
-t docker.io/openstackhelm/libvirt:${DISTRO}-${DISTRO_RELEASE}-${TARGET_OPENSTACK_VERSION} \ -t docker.io/openstackhelm/libvirt:${DISTRO}-${DISTRO_RELEASE}-${LIBVIRT_VERSION} \
tools/images/libvirt tools/images/libvirt
sudo docker push docker.io/openstackhelm/libvirt:${DISTRO}-${DISTRO_RELEASE}-${TARGET_OPENSTACK_VERSION} sudo docker push docker.io/openstackhelm/libvirt:${DISTRO}-${DISTRO_RELEASE}-${LIBVIRT_VERSION}