aboutsummaryrefslogtreecommitdiff
path: root/docker/centos/source/neutron
diff options
context:
space:
mode:
Diffstat (limited to 'docker/centos/source/neutron')
-rw-r--r--docker/centos/source/neutron/neutron-agents/Dockerfile27
l---------docker/centos/source/neutron/neutron-agents/build1
l---------docker/centos/source/neutron/neutron-agents/fwaas_driver.ini1
l---------docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh1
l---------docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/start.sh1
l---------docker/centos/source/neutron/neutron-agents/neutron-l3-agent/config-external.sh1
l---------docker/centos/source/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini1
l---------docker/centos/source/neutron/neutron-agents/neutron-l3-agent/start.sh1
l---------docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/config-external.sh1
l---------docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/start.sh1
l---------docker/centos/source/neutron/neutron-agents/supervisord.conf1
-rw-r--r--docker/centos/source/neutron/neutron-base/.buildinfo10
-rw-r--r--docker/centos/source/neutron/neutron-base/Dockerfile19
l---------docker/centos/source/neutron/neutron-base/build1
l---------docker/centos/source/neutron/neutron-base/config-sudoers.sh1
-rw-r--r--docker/centos/source/neutron/neutron-linuxbridge-agent/Dockerfile10
l---------docker/centos/source/neutron/neutron-linuxbridge-agent/build1
l---------docker/centos/source/neutron/neutron-linuxbridge-agent/config-external.sh1
l---------docker/centos/source/neutron/neutron-linuxbridge-agent/start.sh1
-rw-r--r--docker/centos/source/neutron/neutron-openvswitch-agent/Dockerfile13
l---------docker/centos/source/neutron/neutron-openvswitch-agent/build1
l---------docker/centos/source/neutron/neutron-openvswitch-agent/config-external.sh1
l---------docker/centos/source/neutron/neutron-openvswitch-agent/start.sh1
-rw-r--r--docker/centos/source/neutron/neutron-server/Dockerfile11
l---------docker/centos/source/neutron/neutron-server/build1
l---------docker/centos/source/neutron/neutron-server/config-external.sh1
l---------docker/centos/source/neutron/neutron-server/start.sh1
27 files changed, 0 insertions, 111 deletions
diff --git a/docker/centos/source/neutron/neutron-agents/Dockerfile b/docker/centos/source/neutron/neutron-agents/Dockerfile
deleted file mode 100644
index 546c2a210..000000000
--- a/docker/centos/source/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/source/neutron/neutron-agents/build b/docker/centos/source/neutron/neutron-agents/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/source/neutron/neutron-agents/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/fwaas_driver.ini b/docker/centos/source/neutron/neutron-agents/fwaas_driver.ini
deleted file mode 120000
index 0e016223c..000000000
--- a/docker/centos/source/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/source/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh b/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh
deleted file mode 120000
index 680eee875..000000000
--- a/docker/centos/source/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/source/neutron/neutron-agents/neutron-dhcp-agent/start.sh b/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/start.sh
deleted file mode 120000
index 63dad958d..000000000
--- a/docker/centos/source/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/source/neutron/neutron-agents/neutron-l3-agent/config-external.sh b/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/config-external.sh
deleted file mode 120000
index f4530afd9..000000000
--- a/docker/centos/source/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/source/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini b/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini
deleted file mode 120000
index 8ea67959c..000000000
--- a/docker/centos/source/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/source/neutron/neutron-agents/neutron-l3-agent/start.sh b/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/start.sh
deleted file mode 120000
index fa70dec8b..000000000
--- a/docker/centos/source/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/source/neutron/neutron-agents/neutron-metadata-agent/config-external.sh b/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/config-external.sh
deleted file mode 120000
index a5c3ac24a..000000000
--- a/docker/centos/source/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/source/neutron/neutron-agents/neutron-metadata-agent/start.sh b/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/start.sh
deleted file mode 120000
index 0de2452ee..000000000
--- a/docker/centos/source/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/source/neutron/neutron-agents/supervisord.conf b/docker/centos/source/neutron/neutron-agents/supervisord.conf
deleted file mode 120000
index a7f24cb77..000000000
--- a/docker/centos/source/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/source/neutron/neutron-base/.buildinfo b/docker/centos/source/neutron/neutron-base/.buildinfo
deleted file mode 100644
index b4035affb..000000000
--- a/docker/centos/source/neutron/neutron-base/.buildinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-# Build info specific to this image. All values can be overridden in .buildconf
-
-COMPONENT=neutron
-SOURCE_INSTALL_AVAILABLE=1
-
-# Used for git install method
-: ${CLONE_FROM:=https://github.com/openstack/neutron}
-
-# Used for curl install method
-: ${TARBALL_URI:=http://tarballs.openstack.org/neutron/neutron-master.tar.gz}
diff --git a/docker/centos/source/neutron/neutron-base/Dockerfile b/docker/centos/source/neutron/neutron-base/Dockerfile
deleted file mode 100644
index ee57cfedc..000000000
--- a/docker/centos/source/neutron/neutron-base/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-ADD ./neutron.tar /
-RUN ln -s /neutron-* /neutron
-
-RUN cd /neutron \
- && useradd --user-group neutron \
- && pip install -r requirements.txt \
- && pip install /neutron \
- && mkdir /etc/neutron /usr/share/neutron /var/log/neutron \
- && cp -r etc/* /etc/neutron/ \
- && cp -r etc/neutron/* /etc/neutron/ \
- && cp etc/api-paste.ini /usr/share/neutron \
- && mv /etc/neutron/neutron/ /etc/neutron/plugins/ \
- && chown -R neutron: /etc/neutron /var/log/neutron \
- && rm -rf /root/.cache
-
-COPY config-sudoers.sh /opt/kolla/
diff --git a/docker/centos/source/neutron/neutron-base/build b/docker/centos/source/neutron/neutron-base/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/source/neutron/neutron-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-base/config-sudoers.sh b/docker/centos/source/neutron/neutron-base/config-sudoers.sh
deleted file mode 120000
index 08e65f4d7..000000000
--- a/docker/centos/source/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/source/neutron/neutron-linuxbridge-agent/Dockerfile b/docker/centos/source/neutron/neutron-linuxbridge-agent/Dockerfile
deleted file mode 100644
index ded2b7de0..000000000
--- a/docker/centos/source/neutron/neutron-linuxbridge-agent/Dockerfile
+++ /dev/null
@@ -1,10 +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 && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/neutron/neutron-linuxbridge-agent/build b/docker/centos/source/neutron/neutron-linuxbridge-agent/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/source/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/source/neutron/neutron-linuxbridge-agent/config-external.sh b/docker/centos/source/neutron/neutron-linuxbridge-agent/config-external.sh
deleted file mode 120000
index 6bd77d67d..000000000
--- a/docker/centos/source/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/source/neutron/neutron-linuxbridge-agent/start.sh b/docker/centos/source/neutron/neutron-linuxbridge-agent/start.sh
deleted file mode 120000
index 9d51d3d6a..000000000
--- a/docker/centos/source/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/source/neutron/neutron-openvswitch-agent/Dockerfile b/docker/centos/source/neutron/neutron-openvswitch-agent/Dockerfile
deleted file mode 100644
index 4f447853b..000000000
--- a/docker/centos/source/neutron/neutron-openvswitch-agent/Dockerfile
+++ /dev/null
@@ -1,13 +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 \
- https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm \
- openvswitch \
- && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/neutron/neutron-openvswitch-agent/build b/docker/centos/source/neutron/neutron-openvswitch-agent/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/source/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/source/neutron/neutron-openvswitch-agent/config-external.sh b/docker/centos/source/neutron/neutron-openvswitch-agent/config-external.sh
deleted file mode 120000
index 14354b71a..000000000
--- a/docker/centos/source/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/source/neutron/neutron-openvswitch-agent/start.sh b/docker/centos/source/neutron/neutron-openvswitch-agent/start.sh
deleted file mode 120000
index c14edb0ad..000000000
--- a/docker/centos/source/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/source/neutron/neutron-server/Dockerfile b/docker/centos/source/neutron/neutron-server/Dockerfile
deleted file mode 100644
index f678357a0..000000000
--- a/docker/centos/source/neutron/neutron-server/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 which && \
- yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/neutron/neutron-server/build b/docker/centos/source/neutron/neutron-server/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/source/neutron/neutron-server/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-server/config-external.sh b/docker/centos/source/neutron/neutron-server/config-external.sh
deleted file mode 120000
index b8d7792ce..000000000
--- a/docker/centos/source/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/source/neutron/neutron-server/start.sh b/docker/centos/source/neutron/neutron-server/start.sh
deleted file mode 120000
index a11ea7703..000000000
--- a/docker/centos/source/neutron/neutron-server/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/neutron/neutron-server/start.sh \ No newline at end of file