diff options
| author | Swapnil Kulkarni <me@coolsvap.net> | 2015-08-14 04:31:35 +0000 |
|---|---|---|
| committer | Swapnil Kulkarni <me@coolsvap.net> | 2015-08-17 22:02:09 +0000 |
| commit | 20deecda98f457fdff7ae5bb41fcdd3f0ff5362f (patch) | |
| tree | f12e7dba19f5e5ab390abdce104624ada010454c | |
| parent | cdfb9eb4b26d59d246efc34869f86a5ebf8a0e0b (diff) | |
| download | kolla-20deecda98f457fdff7ae5bb41fcdd3f0ff5362f.tar.gz kolla-20deecda98f457fdff7ae5bb41fcdd3f0ff5362f.zip | |
Update Fedora magnum images to use fedora repo
Change-Id: I9f061c028fa9ab1bfdfdb50a1f2d1578fcbaff68
Closes-Bug: #1484777
| l--------- | docker/fedora/binary/magnum | 1 | ||||
| l--------- | docker/fedora/binary/magnum/magnum-api | 1 | ||||
| -rw-r--r-- | docker/fedora/binary/magnum/magnum-base/Dockerfile | 6 | ||||
| l--------- | docker/fedora/binary/magnum/magnum-base/build | 1 | ||||
| l--------- | docker/fedora/binary/magnum/magnum-conductor | 1 |
5 files changed, 9 insertions, 1 deletions
diff --git a/docker/fedora/binary/magnum b/docker/fedora/binary/magnum deleted file mode 120000 index d5c1f84ed..000000000 --- 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 000000000..47a08ccac --- /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 000000000..15d156932 --- /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 000000000..ec1913803 --- /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 000000000..ba9853139 --- /dev/null +++ b/docker/fedora/binary/magnum/magnum-conductor @@ -0,0 +1 @@ +../../../centos/binary/magnum/magnum-conductor
\ No newline at end of file |