diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2015-11-18 11:00:10 +0000 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2015-11-24 15:54:33 +0000 |
| commit | b3fa0fefee3303f7c405cfa887abdd26f30b5550 (patch) | |
| tree | 369fa19d43bf726806b26c7e5e6e1d45b2d68703 /docker/magnum | |
| parent | d0c277bb4f87f0102552e6bff79395f47dcd6ee1 (diff) | |
| download | kolla-b3fa0fefee3303f7c405cfa887abdd26f30b5550.tar.gz kolla-b3fa0fefee3303f7c405cfa887abdd26f30b5550.zip | |
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
Diffstat (limited to 'docker/magnum')
| -rw-r--r-- | docker/magnum/magnum-base/Dockerfile.j2 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2 index b66dd9b7a..eecac5f1e 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'] %} |