aboutsummaryrefslogtreecommitdiff
path: root/docker/centos/binary/magnum
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-08-27 19:23:49 -0700
committerSteven Dake <stdake@cisco.com>2015-08-28 00:50:30 -0700
commitf895ee07cc5c1030e32854cf9a4e91bbeaf4de12 (patch)
treecc7d17c2c63bf83f6a983553b8729f67abeac58d /docker/centos/binary/magnum
parent5c82e0c90ce0fedf523b11b0b933f2276edf8f46 (diff)
downloadkolla-f895ee07cc5c1030e32854cf9a4e91bbeaf4de12.tar.gz
kolla-f895ee07cc5c1030e32854cf9a4e91bbeaf4de12.zip
Remove docker directory
Remove the docker directory (yay) and old build tools. This will result in an f21 failing gate - however, I have a patch submission to remove that gate from our project configuration. Change-Id: I3c461cedb6906422c8076f60c470e773d6cdcf33 Partially-Implements: blueprint remove-docker-dir
Diffstat (limited to 'docker/centos/binary/magnum')
-rw-r--r--docker/centos/binary/magnum/magnum-api/Dockerfile11
l---------docker/centos/binary/magnum/magnum-api/build1
l---------docker/centos/binary/magnum/magnum-api/config-external.sh1
l---------docker/centos/binary/magnum/magnum-api/start.sh1
-rw-r--r--docker/centos/binary/magnum/magnum-base/Dockerfile6
l---------docker/centos/binary/magnum/magnum-base/build1
-rw-r--r--docker/centos/binary/magnum/magnum-conductor/Dockerfile15
l---------docker/centos/binary/magnum/magnum-conductor/build1
l---------docker/centos/binary/magnum/magnum-conductor/config-external.sh1
l---------docker/centos/binary/magnum/magnum-conductor/start.sh1
10 files changed, 0 insertions, 39 deletions
diff --git a/docker/centos/binary/magnum/magnum-api/Dockerfile b/docker/centos/binary/magnum/magnum-api/Dockerfile
deleted file mode 100644
index 580ceacc8..000000000
--- a/docker/centos/binary/magnum/magnum-api/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%magnum-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
- openstack-magnum-api \
- && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/magnum/magnum-api/build b/docker/centos/binary/magnum/magnum-api/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/magnum/magnum-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/binary/magnum/magnum-api/config-external.sh b/docker/centos/binary/magnum/magnum-api/config-external.sh
deleted file mode 120000
index 746e2aa58..000000000
--- a/docker/centos/binary/magnum/magnum-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/magnum/magnum-api/config-external.sh \ No newline at end of file
diff --git a/docker/centos/binary/magnum/magnum-api/start.sh b/docker/centos/binary/magnum/magnum-api/start.sh
deleted file mode 120000
index 58cc9e37c..000000000
--- a/docker/centos/binary/magnum/magnum-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/magnum/magnum-api/start.sh \ No newline at end of file
diff --git a/docker/centos/binary/magnum/magnum-base/Dockerfile b/docker/centos/binary/magnum/magnum-base/Dockerfile
deleted file mode 100644
index 9928bec88..000000000
--- a/docker/centos/binary/magnum/magnum-base/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-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/epel-7/sdake-openstack-magnum-epel-7.repo -o /etc/yum.repos.d/sdake-openstack-magnum-epel-7.repo
diff --git a/docker/centos/binary/magnum/magnum-base/build b/docker/centos/binary/magnum/magnum-base/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/magnum/magnum-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/binary/magnum/magnum-conductor/Dockerfile b/docker/centos/binary/magnum/magnum-conductor/Dockerfile
deleted file mode 100644
index 093ca5003..000000000
--- a/docker/centos/binary/magnum/magnum-conductor/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%magnum-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
- openstack-magnum-conductor \
- tar \
- && yum clean all
-
-# Install kubectl binary (ugh)
-RUN cd /tmp && curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.15.0/kubernetes.tar.gz -o /tmp/kubernetes.tar.gz && /usr/bin/tar -xzvf /tmp/kubernetes.tar.gz && cp -a /tmp/kubernetes/platforms/linux/amd64/kubectl /usr/bin/kubectl && rm -rf /tmp/kubernetes
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/magnum/magnum-conductor/build b/docker/centos/binary/magnum/magnum-conductor/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/magnum/magnum-conductor/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/binary/magnum/magnum-conductor/config-external.sh b/docker/centos/binary/magnum/magnum-conductor/config-external.sh
deleted file mode 120000
index 2d3f514d5..000000000
--- a/docker/centos/binary/magnum/magnum-conductor/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/magnum/magnum-conductor/config-external.sh \ No newline at end of file
diff --git a/docker/centos/binary/magnum/magnum-conductor/start.sh b/docker/centos/binary/magnum/magnum-conductor/start.sh
deleted file mode 120000
index 681863036..000000000
--- a/docker/centos/binary/magnum/magnum-conductor/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/magnum/magnum-conductor/start.sh \ No newline at end of file