From 20deecda98f457fdff7ae5bb41fcdd3f0ff5362f Mon Sep 17 00:00:00 2001 From: Swapnil Kulkarni <me@coolsvap.net> Date: Fri, 14 Aug 2015 04:31:35 +0000 Subject: [PATCH] Update Fedora magnum images to use fedora repo Change-Id: I9f061c028fa9ab1bfdfdb50a1f2d1578fcbaff68 Closes-Bug: #1484777 --- docker/fedora/binary/magnum | 1 - docker/fedora/binary/magnum/magnum-api | 1 + docker/fedora/binary/magnum/magnum-base/Dockerfile | 6 ++++++ docker/fedora/binary/magnum/magnum-base/build | 1 + docker/fedora/binary/magnum/magnum-conductor | 1 + 5 files changed, 9 insertions(+), 1 deletion(-) delete mode 120000 docker/fedora/binary/magnum create mode 120000 docker/fedora/binary/magnum/magnum-api create mode 100644 docker/fedora/binary/magnum/magnum-base/Dockerfile create mode 120000 docker/fedora/binary/magnum/magnum-base/build create mode 120000 docker/fedora/binary/magnum/magnum-conductor diff --git a/docker/fedora/binary/magnum b/docker/fedora/binary/magnum deleted file mode 120000 index d5c1f84ed3..0000000000 --- a/docker/fedora/binary/magnum +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/magnum \ No newline at end of file diff --git a/docker/fedora/binary/magnum/magnum-api b/docker/fedora/binary/magnum/magnum-api new file mode 120000 index 0000000000..47a08ccaca --- /dev/null +++ b/docker/fedora/binary/magnum/magnum-api @@ -0,0 +1 @@ +../../../centos/binary/magnum/magnum-api \ No newline at end of file diff --git a/docker/fedora/binary/magnum/magnum-base/Dockerfile b/docker/fedora/binary/magnum/magnum-base/Dockerfile new file mode 100644 index 0000000000..15d156932f --- /dev/null +++ b/docker/fedora/binary/magnum/magnum-base/Dockerfile @@ -0,0 +1,6 @@ +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +# Magnum is not yet in upstream RDO packaging + +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 diff --git a/docker/fedora/binary/magnum/magnum-base/build b/docker/fedora/binary/magnum/magnum-base/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/fedora/binary/magnum/magnum-base/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/fedora/binary/magnum/magnum-conductor b/docker/fedora/binary/magnum/magnum-conductor new file mode 120000 index 0000000000..ba98531399 --- /dev/null +++ b/docker/fedora/binary/magnum/magnum-conductor @@ -0,0 +1 @@ +../../../centos/binary/magnum/magnum-conductor \ No newline at end of file