aboutsummaryrefslogtreecommitdiff
path: root/docker/centos/binary/neutron
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/neutron
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/neutron')
-rw-r--r--docker/centos/binary/neutron/neutron-agents/Dockerfile27
l---------docker/centos/binary/neutron/neutron-agents/build1
l---------docker/centos/binary/neutron/neutron-agents/fwaas_driver.ini1
l---------docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh1
l---------docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/start.sh1
l---------docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/config-external.sh1
l---------docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini1
l---------docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/start.sh1
l---------docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/config-external.sh1
l---------docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/start.sh1
l---------docker/centos/binary/neutron/neutron-agents/supervisord.conf1
-rw-r--r--docker/centos/binary/neutron/neutron-base/Dockerfile12
l---------docker/centos/binary/neutron/neutron-base/build1
l---------docker/centos/binary/neutron/neutron-base/config-sudoers.sh1
-rw-r--r--docker/centos/binary/neutron/neutron-linuxbridge-agent/Dockerfile11
l---------docker/centos/binary/neutron/neutron-linuxbridge-agent/build1
l---------docker/centos/binary/neutron/neutron-linuxbridge-agent/config-external.sh1
l---------docker/centos/binary/neutron/neutron-linuxbridge-agent/start.sh1
-rw-r--r--docker/centos/binary/neutron/neutron-openvswitch-agent/Dockerfile12
l---------docker/centos/binary/neutron/neutron-openvswitch-agent/build1
l---------docker/centos/binary/neutron/neutron-openvswitch-agent/config-external.sh1
l---------docker/centos/binary/neutron/neutron-openvswitch-agent/start.sh1
-rw-r--r--docker/centos/binary/neutron/neutron-server/Dockerfile15
l---------docker/centos/binary/neutron/neutron-server/build1
l---------docker/centos/binary/neutron/neutron-server/config-external.sh1
l---------docker/centos/binary/neutron/neutron-server/start.sh1
26 files changed, 0 insertions, 98 deletions
diff --git a/docker/centos/binary/neutron/neutron-agents/Dockerfile b/docker/centos/binary/neutron/neutron-agents/Dockerfile
deleted file mode 100644
index 546c2a210..000000000
--- a/docker/centos/binary/neutron/neutron-agents/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-# Install supervisor
-RUN easy_install supervisor
-
-# Install supervisor-stdout
-RUN pip install supervisor-stdout
-
-# Configure supervisord
-RUN mkdir -p /var/log/supervisor/
-COPY supervisord.conf /etc/
-
-# TODO: SamYaple FWaaS is part of the l3-agent, not a seperate agent that is
-# why this file is needed. To support FWaaS we cannot have a seperate container
-# I need to figure out the best way to make this work together
-#
-# This file _does_ _not_ need to exist, you must remove referencing it from the
-# exec line in the start script. Also all these config options can exist in the
-# main neutron.conf if we wish
-COPY fwaas_driver.ini /etc/neutron/
-
-COPY neutron-dhcp-agent/ /opt/kolla/neutron-dhcp-agent
-COPY neutron-l3-agent/ /opt/kolla/neutron-l3-agent
-COPY neutron-metadata-agent/ /opt/kolla/neutron-metadata-agent
-
-CMD ["/usr/bin/supervisord"]
diff --git a/docker/centos/binary/neutron/neutron-agents/build b/docker/centos/binary/neutron/neutron-agents/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/neutron/neutron-agents/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/binary/neutron/neutron-agents/fwaas_driver.ini b/docker/centos/binary/neutron/neutron-agents/fwaas_driver.ini
deleted file mode 120000
index 0e016223c..000000000
--- a/docker/centos/binary/neutron/neutron-agents/fwaas_driver.ini
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/neutron/neutron-l3-agent/fwaas_driver.ini \ No newline at end of file
diff --git a/docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh b/docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh
deleted file mode 120000
index 680eee875..000000000
--- a/docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../common/neutron/neutron-dhcp-agent/config-external.sh \ No newline at end of file
diff --git a/docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/start.sh b/docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/start.sh
deleted file mode 120000
index 63dad958d..000000000
--- a/docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../common/neutron/neutron-dhcp-agent/start.sh \ No newline at end of file
diff --git a/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/config-external.sh b/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/config-external.sh
deleted file mode 120000
index f4530afd9..000000000
--- a/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../common/neutron/neutron-l3-agent/config-external.sh \ No newline at end of file
diff --git a/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini b/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini
deleted file mode 120000
index 8ea67959c..000000000
--- a/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../common/neutron/neutron-l3-agent/fwaas_driver.ini \ No newline at end of file
diff --git a/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/start.sh b/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/start.sh
deleted file mode 120000
index fa70dec8b..000000000
--- a/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../common/neutron/neutron-l3-agent/start.sh \ No newline at end of file
diff --git a/docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/config-external.sh b/docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/config-external.sh
deleted file mode 120000
index a5c3ac24a..000000000
--- a/docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../common/neutron/neutron-metadata-agent/config-external.sh \ No newline at end of file
diff --git a/docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/start.sh b/docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/start.sh
deleted file mode 120000
index 0de2452ee..000000000
--- a/docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../common/neutron/neutron-metadata-agent/start.sh \ No newline at end of file
diff --git a/docker/centos/binary/neutron/neutron-agents/supervisord.conf b/docker/centos/binary/neutron/neutron-agents/supervisord.conf
deleted file mode 120000
index a7f24cb77..000000000
--- a/docker/centos/binary/neutron/neutron-agents/supervisord.conf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/neutron/neutron-agents/supervisord.conf \ No newline at end of file
diff --git a/docker/centos/binary/neutron/neutron-base/Dockerfile b/docker/centos/binary/neutron/neutron-base/Dockerfile
deleted file mode 100644
index b5a0639b4..000000000
--- a/docker/centos/binary/neutron/neutron-base/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install openstack-neutron \
- openstack-neutron-ml2 \
- openvswitch \
- && yum clean all
-
-# TODO (sdake): remove once RDO adds to the openstack-neutron package
-RUN pip install oslo.versionedobjects
-
-COPY config-sudoers.sh /opt/kolla/
diff --git a/docker/centos/binary/neutron/neutron-base/build b/docker/centos/binary/neutron/neutron-base/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/neutron/neutron-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/binary/neutron/neutron-base/config-sudoers.sh b/docker/centos/binary/neutron/neutron-base/config-sudoers.sh
deleted file mode 120000
index 08e65f4d7..000000000
--- a/docker/centos/binary/neutron/neutron-base/config-sudoers.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/neutron/neutron-base/config-sudoers.sh \ No newline at end of file
diff --git a/docker/centos/binary/neutron/neutron-linuxbridge-agent/Dockerfile b/docker/centos/binary/neutron/neutron-linuxbridge-agent/Dockerfile
deleted file mode 100644
index 5d482f515..000000000
--- a/docker/centos/binary/neutron/neutron-linuxbridge-agent/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-# Install required packages
-RUN yum install -y ebtables openstack-neutron-linuxbridge && \
- yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/neutron/neutron-linuxbridge-agent/build b/docker/centos/binary/neutron/neutron-linuxbridge-agent/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/neutron/neutron-linuxbridge-agent/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/binary/neutron/neutron-linuxbridge-agent/config-external.sh b/docker/centos/binary/neutron/neutron-linuxbridge-agent/config-external.sh
deleted file mode 120000
index 6bd77d67d..000000000
--- a/docker/centos/binary/neutron/neutron-linuxbridge-agent/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/neutron/neutron-linuxbridge-agent/config-external.sh \ No newline at end of file
diff --git a/docker/centos/binary/neutron/neutron-linuxbridge-agent/start.sh b/docker/centos/binary/neutron/neutron-linuxbridge-agent/start.sh
deleted file mode 120000
index 9d51d3d6a..000000000
--- a/docker/centos/binary/neutron/neutron-linuxbridge-agent/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/neutron/neutron-linuxbridge-agent/start.sh \ No newline at end of file
diff --git a/docker/centos/binary/neutron/neutron-openvswitch-agent/Dockerfile b/docker/centos/binary/neutron/neutron-openvswitch-agent/Dockerfile
deleted file mode 100644
index 762f6b189..000000000
--- a/docker/centos/binary/neutron/neutron-openvswitch-agent/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-# Install required packages
-RUN yum install -y openstack-neutron-openvswitch \
- openvswitch \
- && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/neutron/neutron-openvswitch-agent/build b/docker/centos/binary/neutron/neutron-openvswitch-agent/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/neutron/neutron-openvswitch-agent/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/binary/neutron/neutron-openvswitch-agent/config-external.sh b/docker/centos/binary/neutron/neutron-openvswitch-agent/config-external.sh
deleted file mode 120000
index 14354b71a..000000000
--- a/docker/centos/binary/neutron/neutron-openvswitch-agent/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/neutron/neutron-openvswitch-agent/config-external.sh \ No newline at end of file
diff --git a/docker/centos/binary/neutron/neutron-openvswitch-agent/start.sh b/docker/centos/binary/neutron/neutron-openvswitch-agent/start.sh
deleted file mode 120000
index c14edb0ad..000000000
--- a/docker/centos/binary/neutron/neutron-openvswitch-agent/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/neutron/neutron-openvswitch-agent/start.sh \ No newline at end of file
diff --git a/docker/centos/binary/neutron/neutron-server/Dockerfile b/docker/centos/binary/neutron/neutron-server/Dockerfile
deleted file mode 100644
index de80f4ff8..000000000
--- a/docker/centos/binary/neutron/neutron-server/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-# Install required packages
-RUN yum install -y which && \
- yum clean all
-
-# See bug: https://bugs.launchpad.net/kolla/+bug/1483667
-# TODO(SamYaple): Check in on this and remove once unneccesary
-RUN pip install oslo.messaging==2.2.0
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/neutron/neutron-server/build b/docker/centos/binary/neutron/neutron-server/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/neutron/neutron-server/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/binary/neutron/neutron-server/config-external.sh b/docker/centos/binary/neutron/neutron-server/config-external.sh
deleted file mode 120000
index b8d7792ce..000000000
--- a/docker/centos/binary/neutron/neutron-server/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/neutron/neutron-server/config-external.sh \ No newline at end of file
diff --git a/docker/centos/binary/neutron/neutron-server/start.sh b/docker/centos/binary/neutron/neutron-server/start.sh
deleted file mode 120000
index a11ea7703..000000000
--- a/docker/centos/binary/neutron/neutron-server/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/neutron/neutron-server/start.sh \ No newline at end of file