From b3fa0fefee3303f7c405cfa887abdd26f30b5550 Mon Sep 17 00:00:00 2001
From: Paul Bourke <paul.bourke@oracle.com>
Date: Wed, 18 Nov 2015 11:00:10 +0000
Subject: [PATCH] Install magnum-common packages for binary builds
User magnum is missing from the binary image, install magnum-common to
fix this.
Closes-Bug: 1519390
Change-Id: I23e1206ab14b02de716374d28be2ef42e75e5beb
---
docker/magnum/magnum-base/Dockerfile.j2 | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2
index b66dd9b7a4..eecac5f1ea 100644
--- a/docker/magnum/magnum-base/Dockerfile.j2
+++ b/docker/magnum/magnum-base/Dockerfile.j2
@@ -4,11 +4,15 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos'] %}
-RUN curl https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/epel-7/sdake-openstack-magnum-epel-7.repo -o /etc/yum.repos.d/sdake-openstack-magnum-epel-7.repo
+RUN curl https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/epel-7/sdake-openstack-magnum-epel-7.repo -o /etc/yum.repos.d/sdake-openstack-magnum-epel-7.repo \
+ && yum install -y openstack-magnum-common \
+ && yum clean all
{% elif base_distro in ['fedora'] %}
-RUN curl https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/fedora-22/sdake-openstack-magnum-fedora-22.repo -o /etc/yum.repos.d/sdake-openstack-magnum-f22.repo
+RUN curl https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/fedora-22/sdake-openstack-magnum-fedora-22.repo -o /etc/yum.repos.d/sdake-openstack-magnum-f22.repo |
+ && yum install -y openstack-magnum-common \
+ && yum clean all
{% elif base_distro in ['oraclelinux'] %}