From f8880d27add6d1a7d1cf8f3b6566f742cdaa4690 Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Fri, 5 Oct 2018 15:41:12 -0500
Subject: [PATCH] Libvirt: Fix image

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>
---
 libvirt/values.yaml                           | 2 +-
 tools/images/libvirt/Dockerfile.ubuntu.xenial | 6 ++----
 tools/images/libvirt/Makefile                 | 6 +++---
 tools/images/libvirt/README.rst               | 8 ++++----
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/libvirt/values.yaml b/libvirt/values.yaml
index c6cbcff62..b40cc3cae 100644
--- a/libvirt/values.yaml
+++ b/libvirt/values.yaml
@@ -27,7 +27,7 @@ labels:
 
 images:
   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
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: "IfNotPresent"
diff --git a/tools/images/libvirt/Dockerfile.ubuntu.xenial b/tools/images/libvirt/Dockerfile.ubuntu.xenial
index 4b69d204f..c4e9b97f6 100644
--- a/tools/images/libvirt/Dockerfile.ubuntu.xenial
+++ b/tools/images/libvirt/Dockerfile.ubuntu.xenial
@@ -1,7 +1,7 @@
 FROM docker.io/ubuntu:xenial
 MAINTAINER pete.birley@att.com
 
-ARG TARGET_OPENSTACK_VERSION=ocata
+ARG LIBVIRT_VERSION=ocata
 ARG CEPH_RELEASE=luminous
 ARG PROJECT=nova
 ARG UID=42424
@@ -13,8 +13,6 @@ RUN set -ex ;\
     apt-key add /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 ;\
-    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 upgrade -y ;\
     apt-get install --no-install-recommends -y \
@@ -23,7 +21,7 @@ RUN set -ex ;\
       dmidecode \
       ebtables \
       iproute2 \
-      libvirt-bin \
+      libvirt-bin=${LIBVIRT_VERSION} \
       pm-utils \
       qemu \
       qemu-block-extra \
diff --git a/tools/images/libvirt/Makefile b/tools/images/libvirt/Makefile
index 017abaa27..71b1dcf74 100644
--- a/tools/images/libvirt/Makefile
+++ b/tools/images/libvirt/Makefile
@@ -15,7 +15,7 @@
 # It's necessary to set this because some environments don't link sh -> bash.
 SHELL := /bin/bash
 
-TARGET_OPENSTACK_VERSION   ?= ocata
+LIBVIRT_VERSION            ?= 1.3.1-1ubuntu10.24
 DISTRO                     ?= ubuntu
 DISTRO_RELEASE             ?= xenial
 CEPH_RELEASE               ?= luminous
@@ -23,7 +23,7 @@ CEPH_RELEASE               ?= luminous
 DOCKER_REGISTRY            ?= docker.io
 IMAGE_NAME                 ?= libvirt
 IMAGE_PREFIX               ?= openstackhelm
-IMAGE_TAG                  ?= $(DISTRO)-$(DISTRO_RELEASE)-$(TARGET_OPENSTACK_VERSION)
+IMAGE_TAG                  ?= $(DISTRO)-$(DISTRO_RELEASE)-$(LIBVIRT_VERSION)
 LABEL                      ?= putlabelshere
 
 IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
@@ -39,7 +39,7 @@ build_$(IMAGE_NAME):
 	--network=host \
 	--force-rm \
 	--file=./Dockerfile.${DISTRO}.xenial \
-	--build-arg TARGET_OPENSTACK_VERSION="${TARGET_OPENSTACK_VERSION}" \
+	--build-arg LIBVIRT_VERSION="${LIBVIRT_VERSION}" \
 	--build-arg CEPH_RELEASE="${CEPH_RELEASE}" \
 	--label $(LABEL) \
 	-t $(IMAGE) \
diff --git a/tools/images/libvirt/README.rst b/tools/images/libvirt/README.rst
index 384b3222f..cab427c1a 100644
--- a/tools/images/libvirt/README.rst
+++ b/tools/images/libvirt/README.rst
@@ -30,7 +30,7 @@ repo run:
 
 .. code:: bash
 
-    TARGET_OPENSTACK_VERSION=ocata
+    LIBVIRT_VERSION=1.3.1-1ubuntu10.24
     DISTRO=ubuntu
     DISTRO_RELEASE=xenial
     CEPH_RELEASE=luminous
@@ -41,8 +41,8 @@ repo run:
       --pull \
       --no-cache \
       --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}" \
-      -t docker.io/openstackhelm/libvirt:${DISTRO}-${DISTRO_RELEASE}-${TARGET_OPENSTACK_VERSION} \
+      -t docker.io/openstackhelm/libvirt:${DISTRO}-${DISTRO_RELEASE}-${LIBVIRT_VERSION} \
       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}