diff --git a/README.rst b/README.rst
index 2d6ad79e76a73c6bca36f239136619372391a142..5bab37cf5eca0c57947cac1fb86808d6f3786dbb 100644
--- a/README.rst
+++ b/README.rst
@@ -71,9 +71,6 @@ Directories
    Ansible.
 -  demos - Contains a few demos to use with Kolla.
 -  devenv - Contains an OpenStack-Heat based development environment.
--  docker - Contains a normal Dockerfile based set of artifacts for
-   building docker. This is planned for removal when docker\_templates
-   is completed.
 -  docs - Contains documentation.
 -  etc - Contains a reference etc directory structure which requires
    configuration of a small number of configuration variables to achieve
diff --git a/docker/centos/binary/base/Dockerfile b/docker/centos/binary/base/Dockerfile
deleted file mode 100644
index 31b2566f75ab20a1d130c0dbca1aa6e88c2a4bfa..0000000000000000000000000000000000000000
--- a/docker/centos/binary/base/Dockerfile
+++ /dev/null
@@ -1,118 +0,0 @@
-FROM centos
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-# Set up repositories
-# This repository provides all dependencies used by RDO OpenStack
-RUN yum install -y https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm
-# This repository provides latest packages built from trunk master into RPMs
-RUN curl http://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/yum.repos.d/delorean-current.repo
-# This repository turns off auth in PAM so we can operate on Ubuntu 14.04
-RUN curl https://copr.fedoraproject.org/coprs/sdake/pam.noaudit/repo/epel-7/sdake-pam.noaudit-epel-7.repo -o /etc/yum.repos.d/sdake-pam.noaudit-epel-7.repo
-
-# CentOS 7.1 workaround for conflicting packages with libvirt
-RUN rpm -e --nodeps systemd-container systemd-container-libs
-RUN rpm -e --nodeps yum-plugin-fastestmirror
-RUN yum -d 10 -y install systemd systemd-libs systemd-devel && yum clean all
-
-RUN yum install -y epel-release && yum clean all
-
-# Update packages
-RUN yum update -y && yum clean all
-
-# Install base packages
-RUN yum install -y \
-        mariadb \
-        mariadb-libs \
-        openssl \
-        openstack-utils \
-        pyparsing \
-        python-alembic \
-        python-amqp \
-        python-amqplib \
-        python-anyjson \
-        python-boto \
-        python-cheetah \
-        python-cliff \
-        python-cmd2 \
-        python-croniter \
-        python-crypto \
-        python-d2to1 \
-        python-docutils \
-        python-dogpile-cache \
-        python-dogpile-core \
-        python-empy \
-        python-eventlet \
-        python-flask \
-        python-futures \
-        python-greenlet \
-        python-httplib2 \
-        python-iso8601 \
-        python-itsdangerous \
-        python-jinja2 \
-        python-jsonpatch \
-        python-jsonpath-rw \
-        python-jsonpointer \
-        python-jsonschema \
-        python-keyring \
-        python-kombu \
-        python-ldap \
-        python-lesscpy \
-        python-lockfile \
-        python-lxml \
-        python-markdown \
-        python-memcached \
-        python-migrate \
-        python-msgpack \
-        python-netifaces \
-        python-networkx \
-        python-oauthlib \
-        python-oslo-config \
-        python-oslo-messaging \
-        python-oslo-rootwrap \
-        python-oslo-policy \
-        python-paramiko \
-        python-passlib \
-        python-paste-deploy \
-        python-pbr \
-        python-pecan \
-        python-pip \
-        python-ply \
-        python-prettytable \
-        python-psutil \
-        python-pycadf \
-        python-pygments \
-        python-pymongo \
-        python-qpid \
-        python-repoze-lru \
-        python-requests \
-        python-routes \
-        python-simplegeneric \
-        python-simplejson \
-        python-singledispatch \
-        python-six \
-        python-sqlalchemy \
-        python-stevedore \
-        python-taskflow \
-        python-versiontools \
-        python-warlock \
-        python-webob \
-        python-websockify \
-        python-webtest \
-        python-werkzeug \
-        python-wsme \
-        && yum clean all
-
-# TODO(inc0): when oslo_service lands in delorean, change pip to yum
-# necessary until https://bugzilla.redhat.com/show_bug.cgi?id=1229477 is fixed
-
-# This is dirty like zebra.  This works around a bug in Ubuntu 14.04 LTS.  The
-# --net=host option does not work on ubuntu 14.04 because of a kernel bug.  One
-# workaround is to buid pam without authentication.
-# See:
-#    https://registry.hub.docker.com/u/sequenceiq/pam/
-#
-RUN rpm -e --nodeps pam
-RUN yum -y install pam+noaudit && yum clean all
-# End dirty like zebra
-
-COPY kolla-common.sh /opt/kolla/
diff --git a/docker/centos/binary/base/build b/docker/centos/binary/base/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/centos/binary/base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/base/kolla-common.sh b/docker/centos/binary/base/kolla-common.sh
deleted file mode 120000
index c265c62f7ae70d3fa72661782afc0be3affc49c8..0000000000000000000000000000000000000000
--- a/docker/centos/binary/base/kolla-common.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/base/kolla-common.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile
deleted file mode 100644
index 92ba970ac33767118f281b2015065a7447cb98f3..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum install -y openstack-ceilometer-alarm && yum clean all
-
-COPY ./start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/ceilometer/ceilometer-alarm/build b/docker/centos/binary/ceilometer/ceilometer-alarm/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-alarm/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-alarm/config-external.sh b/docker/centos/binary/ceilometer/ceilometer-alarm/config-external.sh
deleted file mode 120000
index 0a48ebf52661ad79e01f2cd5a8cc454561443294..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-alarm/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-alarm/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-alarm/start.sh b/docker/centos/binary/ceilometer/ceilometer-alarm/start.sh
deleted file mode 120000
index ed3ac528d4f721cc8b11d91173619ba484ac3f2f..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-alarm/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-alarm/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-api/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-api/Dockerfile
deleted file mode 100644
index 56cb0fb8700d408a7a0d5b98bda7f394e7bcebbb..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-api/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum install -y openstack-ceilometer-api && yum clean all
-
-COPY ./start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/ceilometer/ceilometer-api/build b/docker/centos/binary/ceilometer/ceilometer-api/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-api/config-external.sh b/docker/centos/binary/ceilometer/ceilometer-api/config-external.sh
deleted file mode 120000
index 4ea59dad76aabc40022ef51529e2a8c966eaae8e..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-api/start.sh b/docker/centos/binary/ceilometer/ceilometer-api/start.sh
deleted file mode 120000
index 7acfa2cba6e19e8e859f4e4ffbb021c4ada51401..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-base/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-base/Dockerfile
deleted file mode 100644
index 30c8fbae326a99d92711d52b2484621ed20826cb..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-base/Dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
diff --git a/docker/centos/binary/ceilometer/ceilometer-base/build b/docker/centos/binary/ceilometer/ceilometer-base/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-central/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-central/Dockerfile
deleted file mode 100644
index f48a68d74415ff7761c2ad127c4eceff56bc7cd5..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-central/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum install -y openstack-ceilometer-central && yum clean all
-
-COPY ./start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/ceilometer/ceilometer-central/build b/docker/centos/binary/ceilometer/ceilometer-central/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-central/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-central/config-external.sh b/docker/centos/binary/ceilometer/ceilometer-central/config-external.sh
deleted file mode 120000
index cfc69e75d868f0327ccffc9be88e5d3a8e65056e..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-central/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-central/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-central/start.sh b/docker/centos/binary/ceilometer/ceilometer-central/start.sh
deleted file mode 120000
index 8df383cd16874e524b98cd47d3bdaa19da114833..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-central/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-central/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile
deleted file mode 100644
index ed9b540111d1bc6e468b4548d82ccaee6e390880..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum install -y openstack-ceilometer-collector && yum clean all
-
-COPY ./start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/ceilometer/ceilometer-collector/build b/docker/centos/binary/ceilometer/ceilometer-collector/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-collector/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-collector/config-external.sh b/docker/centos/binary/ceilometer/ceilometer-collector/config-external.sh
deleted file mode 120000
index e16dcecc181ac4c73f5c0934c3c49d8bc5e30bd9..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-collector/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-collector/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-collector/start.sh b/docker/centos/binary/ceilometer/ceilometer-collector/start.sh
deleted file mode 120000
index bea2eb09c1c3d6ab02d524767436de7f3a50d15d..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-collector/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-collector/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile
deleted file mode 100644
index 50a6b7bf654a09208dc7205336cdb3049acd15fe..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum install -y openstack-ceilometer-compute python-ceilometerclient python-pecan \
-    && yum clean all
-
-COPY ./start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/ceilometer/ceilometer-compute/build b/docker/centos/binary/ceilometer/ceilometer-compute/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-compute/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-compute/config-external.sh b/docker/centos/binary/ceilometer/ceilometer-compute/config-external.sh
deleted file mode 120000
index 1d0c728e57b4e17a3062bff31c23abde810d0534..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-compute/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-compute/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-compute/start.sh b/docker/centos/binary/ceilometer/ceilometer-compute/start.sh
deleted file mode 120000
index 1118b9552d2f4c63cc113985251927cbdd52388b..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-compute/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-compute/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile
deleted file mode 100644
index 7314d7bd0691e8740b62c3448438fe252fdacbb6..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum install -y openstack-ceilometer-notification && yum clean all
-
-COPY ./start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/ceilometer/ceilometer-notification/build b/docker/centos/binary/ceilometer/ceilometer-notification/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-notification/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-notification/config-external.sh b/docker/centos/binary/ceilometer/ceilometer-notification/config-external.sh
deleted file mode 120000
index 12d98d9eeb894ecef7c44eac985af9659a9b15b3..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-notification/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-notification/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-notification/start.sh b/docker/centos/binary/ceilometer/ceilometer-notification/start.sh
deleted file mode 120000
index 8e6d4e3374a39131c1c2c3765edd0a8a6da4b88c..0000000000000000000000000000000000000000
--- a/docker/centos/binary/ceilometer/ceilometer-notification/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-notification/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-api/Dockerfile b/docker/centos/binary/cinder/cinder-api/Dockerfile
deleted file mode 100644
index 7eed0b311720bb6e4a6064af7a8a8d1258c54f82..0000000000000000000000000000000000000000
--- a/docker/centos/binary/cinder/cinder-api/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum install -y python-keystone && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/cinder/cinder-api/build b/docker/centos/binary/cinder/cinder-api/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/cinder/cinder-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-api/config-external.sh b/docker/centos/binary/cinder/cinder-api/config-external.sh
deleted file mode 120000
index 0e9409e98672503aaf77a060b25eb8f5bf4c609d..0000000000000000000000000000000000000000
--- a/docker/centos/binary/cinder/cinder-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-api/start.sh b/docker/centos/binary/cinder/cinder-api/start.sh
deleted file mode 120000
index 4b6c5f104a7a293fce5b1b1bf5a57e2c58d1d93a..0000000000000000000000000000000000000000
--- a/docker/centos/binary/cinder/cinder-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-backup/Dockerfile b/docker/centos/binary/cinder/cinder-backup/Dockerfile
deleted file mode 100644
index 70b8d8202698d38890bf7db7b9ea3c695059b983..0000000000000000000000000000000000000000
--- a/docker/centos/binary/cinder/cinder-backup/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY ./start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/cinder/cinder-backup/build b/docker/centos/binary/cinder/cinder-backup/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/cinder/cinder-backup/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-backup/config-external.sh b/docker/centos/binary/cinder/cinder-backup/config-external.sh
deleted file mode 120000
index 4c6f65d405eb530e479d9043ab07494a1dbffc53..0000000000000000000000000000000000000000
--- a/docker/centos/binary/cinder/cinder-backup/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-backup/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-backup/start.sh b/docker/centos/binary/cinder/cinder-backup/start.sh
deleted file mode 120000
index 62ae41b035bf78f0f2dd2a3b0a0b7b2b16b0ef0b..0000000000000000000000000000000000000000
--- a/docker/centos/binary/cinder/cinder-backup/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-backup/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-base/Dockerfile b/docker/centos/binary/cinder/cinder-base/Dockerfile
deleted file mode 100644
index 6b699dae5dd55be86b97511cfac8be376d8f9aad..0000000000000000000000000000000000000000
--- a/docker/centos/binary/cinder/cinder-base/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install openstack-cinder \
-        python-automaton \
-    && sed -i "s|udev_rules = 1|udev_rules = 0|g" /etc/lvm/lvm.conf \
-    && sed -i "s|udev_sync = 1|udev_sync = 0|g" /etc/lvm/lvm.conf \
-    && yum clean all
-
-# NOTE(sdake): The sed operations make LVM tools work inside a container - see
-# https://groups.google.com/forum/#!topic/docker-user/n4Xtvsb4RAw
diff --git a/docker/centos/binary/cinder/cinder-base/build b/docker/centos/binary/cinder/cinder-base/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/cinder/cinder-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-scheduler/Dockerfile b/docker/centos/binary/cinder/cinder-scheduler/Dockerfile
deleted file mode 100644
index 70b8d8202698d38890bf7db7b9ea3c695059b983..0000000000000000000000000000000000000000
--- a/docker/centos/binary/cinder/cinder-scheduler/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY ./start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/cinder/cinder-scheduler/build b/docker/centos/binary/cinder/cinder-scheduler/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/cinder/cinder-scheduler/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-scheduler/config-external.sh b/docker/centos/binary/cinder/cinder-scheduler/config-external.sh
deleted file mode 120000
index f6d26aba5ba5ed74f20577712ce2ea3511b76411..0000000000000000000000000000000000000000
--- a/docker/centos/binary/cinder/cinder-scheduler/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-scheduler/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-scheduler/start.sh b/docker/centos/binary/cinder/cinder-scheduler/start.sh
deleted file mode 120000
index 0953c6457f407d000c341202e896fa54a3097e3b..0000000000000000000000000000000000000000
--- a/docker/centos/binary/cinder/cinder-scheduler/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-scheduler/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-volume/Dockerfile b/docker/centos/binary/cinder/cinder-volume/Dockerfile
deleted file mode 100644
index 17412fefae2c94fa796738afcbf47fb1f275ce64..0000000000000000000000000000000000000000
--- a/docker/centos/binary/cinder/cinder-volume/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-# Install required packages
-RUN yum install -y lvm2 scsi-target-utils && yum clean all
-
-# Add start scripts
-COPY config-external.sh /opt/kolla/
-COPY start.sh /start.sh
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/cinder/cinder-volume/build b/docker/centos/binary/cinder/cinder-volume/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/cinder/cinder-volume/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-volume/config-external.sh b/docker/centos/binary/cinder/cinder-volume/config-external.sh
deleted file mode 120000
index abcdd6bc48b8a79867f2e05b0c60261bf9951882..0000000000000000000000000000000000000000
--- a/docker/centos/binary/cinder/cinder-volume/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-volume/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-volume/start.sh b/docker/centos/binary/cinder/cinder-volume/start.sh
deleted file mode 120000
index 471a5ebd7cbe190d2a66a189ef091571a246b756..0000000000000000000000000000000000000000
--- a/docker/centos/binary/cinder/cinder-volume/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-volume/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/data/Dockerfile b/docker/centos/binary/data/Dockerfile
deleted file mode 100644
index 63591854075a1b4e74419181a1485d066cf20fdf..0000000000000000000000000000000000000000
--- a/docker/centos/binary/data/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM centos
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-CMD /bin/sleep infinity
diff --git a/docker/centos/binary/data/build b/docker/centos/binary/data/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/centos/binary/data/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/designate/designate-api/Dockerfile b/docker/centos/binary/designate/designate-api/Dockerfile
deleted file mode 100644
index 34011aca22e278e89bc4ffc36cd6517120cd1d41..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-api/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum install -y \
-    openstack-designate-api \
-    && yum clean all
-
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/designate/designate-api/build b/docker/centos/binary/designate/designate-api/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/designate/designate-api/config-external.sh b/docker/centos/binary/designate/designate-api/config-external.sh
deleted file mode 120000
index da641a600606b972089b3ca797bcf5856bbe8469..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/designate/designate-api/start.sh b/docker/centos/binary/designate/designate-api/start.sh
deleted file mode 120000
index f96fe1a342ccf1e21a3176eea442e7dc06c12be6..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/designate/designate-backend-bind9/Dockerfile b/docker/centos/binary/designate/designate-backend-bind9/Dockerfile
deleted file mode 100644
index 172645f8c3eeb691a920894f806fcbfd374365fd..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-backend-bind9/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum install -y bind \
-    && yum clean all \
-    && cp -pr /var/named /opt/kolla/var-named
-
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/designate/designate-backend-bind9/build b/docker/centos/binary/designate/designate-backend-bind9/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-backend-bind9/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/designate/designate-backend-bind9/config-external.sh b/docker/centos/binary/designate/designate-backend-bind9/config-external.sh
deleted file mode 120000
index 98eabc775e729d96b4302a761e4153d2cd8894a4..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-backend-bind9/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-backend-bind9/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/designate/designate-backend-bind9/start.sh b/docker/centos/binary/designate/designate-backend-bind9/start.sh
deleted file mode 120000
index 918411fa1a46eb9b875d7f44f985d7284958e3a5..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-backend-bind9/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-backend-bind9/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/designate/designate-base/Dockerfile b/docker/centos/binary/designate/designate-base/Dockerfile
deleted file mode 100644
index 1b4ebe9ec02d5572332d9dd9b6a2c2130a14039b..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-base/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-# Install designate-api because of /etc/designate/policy.json, which
-# is needed in all services. This is probably a packaging bug. We do
-# need the complete policy file because of some of the containers'
-# requiring it. Remove the package when the file is moved though.
-RUN yum install -y \
-    MySQL-python \
-    openstack-designate-api \
-    openstack-designate-common \
-    python-tooz \
-    && yum clean all \
-    && cp /etc/designate/policy.json /tmp/ \
-    && rpm -e openstack-designate-api \
-    && mv /tmp/policy.json /etc/designate/
diff --git a/docker/centos/binary/designate/designate-base/build b/docker/centos/binary/designate/designate-base/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/designate/designate-central/Dockerfile b/docker/centos/binary/designate/designate-central/Dockerfile
deleted file mode 100644
index 480f60513d20c339648c69d935b287a6fc0abe6c..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-central/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum install -y \
-    openstack-designate-central \
-    && yum clean all
-
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/designate/designate-central/build b/docker/centos/binary/designate/designate-central/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-central/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/designate/designate-central/config-external.sh b/docker/centos/binary/designate/designate-central/config-external.sh
deleted file mode 120000
index abe5bcd3950adca1ce10b10dae2a838f548207ed..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-central/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-central/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/designate/designate-central/start.sh b/docker/centos/binary/designate/designate-central/start.sh
deleted file mode 120000
index 9e0a8c484abaf9c9b7ef17f0deac9c317005074d..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-central/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-central/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/designate/designate-mdns/Dockerfile b/docker/centos/binary/designate/designate-mdns/Dockerfile
deleted file mode 100644
index befdc14e6510066e54a7f57a45c9e0d3aa0d70bb..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-mdns/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum install -y openstack-designate-mdns \
-    && yum clean all
-
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/designate/designate-mdns/build b/docker/centos/binary/designate/designate-mdns/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-mdns/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/designate/designate-mdns/config-external.sh b/docker/centos/binary/designate/designate-mdns/config-external.sh
deleted file mode 120000
index e450238fcca42d680fa14e914c1a02b7be1d0437..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-mdns/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-mdns/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/designate/designate-mdns/start.sh b/docker/centos/binary/designate/designate-mdns/start.sh
deleted file mode 120000
index f7bf747fc5b452b89ab5751545e015b4afbf7bdc..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-mdns/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-mdns/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/designate/designate-poolmanager/Dockerfile b/docker/centos/binary/designate/designate-poolmanager/Dockerfile
deleted file mode 100644
index 2a185106046a24cd1a561a6c50c6cbee0f84c823..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-poolmanager/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-# The bind9 package here is only to provide the rndc binary.
-RUN yum install -y \
-    openstack-designate-pool-manager \
-    bind \
-    && yum clean all
-
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/designate/designate-poolmanager/build b/docker/centos/binary/designate/designate-poolmanager/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-poolmanager/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/designate/designate-poolmanager/config-external.sh b/docker/centos/binary/designate/designate-poolmanager/config-external.sh
deleted file mode 120000
index 461acb12ac8f8fc52e2bd2ac2881633846b2cc42..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-poolmanager/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-poolmanager/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/designate/designate-poolmanager/start.sh b/docker/centos/binary/designate/designate-poolmanager/start.sh
deleted file mode 120000
index cc428b4fe4b91db92f363d9a9f4abb66fc733282..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-poolmanager/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-poolmanager/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/designate/designate-sink/Dockerfile b/docker/centos/binary/designate/designate-sink/Dockerfile
deleted file mode 100644
index e2f3b60266aa8ac6180183629f958c381643275a..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-sink/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum install -y \
-    openstack-designate-sink \
-    python-designateclient \
-    && yum clean all
-
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/designate/designate-sink/build b/docker/centos/binary/designate/designate-sink/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-sink/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/designate/designate-sink/config-external.sh b/docker/centos/binary/designate/designate-sink/config-external.sh
deleted file mode 120000
index edc94e6e434ff277012888a8d3cb415f911174e3..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-sink/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-sink/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/designate/designate-sink/start.sh b/docker/centos/binary/designate/designate-sink/start.sh
deleted file mode 120000
index 751b58345d26cbfb4ca6549c8b811295099395fe..0000000000000000000000000000000000000000
--- a/docker/centos/binary/designate/designate-sink/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-sink/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/galera/Dockerfile b/docker/centos/binary/galera/Dockerfile
deleted file mode 100644
index 9a21c3440f8328314665c01e1f718edba0e06b8b..0000000000000000000000000000000000000000
--- a/docker/centos/binary/galera/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN echo "[mariadb]" > /etc/yum.repos.d/MariaDB.repo && \
-   echo "name = MariaDB" >> /etc/yum.repos.d/MariaDB.repo && \
-   echo "baseurl = http://yum.mariadb.org/10.0/centos7-amd64" >> /etc/yum.repos.d/MariaDB.repo && \
-   echo "gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB" >> /etc/yum.repos.d/MariaDB.repo && \
-   echo "gpgcheck=1" >> /etc/yum.repos.d/MariaDB.repo && \
-   yum install -y \
-      http://www.percona.com/redir/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm && \
-   sed -i 's|$releasever|centos/latest|g' /etc/yum.repos.d/percona-release.repo && \
-   yum install -y \
-      MariaDB-Galera-server \
-      MariaDB-client \
-      rsync \
-      galera \
-      socat \
-      hostname \
-      percona-xtrabackup \
-      pv \
-      tar \
-      expect \
-    && rm -rf /var/lib/mysql/*
-
-COPY config-galera.sh /opt/kolla/config/
-COPY config-external.sh /opt/kolla/
-COPY start.sh /
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/galera/build b/docker/centos/binary/galera/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/centos/binary/galera/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/galera/config-external.sh b/docker/centos/binary/galera/config-external.sh
deleted file mode 120000
index 72a04836e71ac3aaa16b16ef11b67fa8a2b1641f..0000000000000000000000000000000000000000
--- a/docker/centos/binary/galera/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/galera/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/galera/config-galera.sh b/docker/centos/binary/galera/config-galera.sh
deleted file mode 120000
index f6782bb871765345e3ca337b78e00e6460bd820b..0000000000000000000000000000000000000000
--- a/docker/centos/binary/galera/config-galera.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/galera/config-galera.sh
\ No newline at end of file
diff --git a/docker/centos/binary/galera/start.sh b/docker/centos/binary/galera/start.sh
deleted file mode 120000
index 1fa9a143dbb068c5b297b12c60184a78335a78a7..0000000000000000000000000000000000000000
--- a/docker/centos/binary/galera/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/galera/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/glance/glance-api/Dockerfile b/docker/centos/binary/glance/glance-api/Dockerfile
deleted file mode 100644
index c3c0fd9d130954cdf4841fa123b57cf8e1d5a605..0000000000000000000000000000000000000000
--- a/docker/centos/binary/glance/glance-api/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/glance/glance-api/build b/docker/centos/binary/glance/glance-api/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/glance/glance-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/glance/glance-api/config-external.sh b/docker/centos/binary/glance/glance-api/config-external.sh
deleted file mode 120000
index 46a22b7b31326c6b1984567931dbc24d63f5da57..0000000000000000000000000000000000000000
--- a/docker/centos/binary/glance/glance-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/glance/glance-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/glance/glance-api/start.sh b/docker/centos/binary/glance/glance-api/start.sh
deleted file mode 120000
index 6740e1fe92d7ed051c1fb61229b3709afe364989..0000000000000000000000000000000000000000
--- a/docker/centos/binary/glance/glance-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/glance/glance-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/glance/glance-base/Dockerfile b/docker/centos/binary/glance/glance-base/Dockerfile
deleted file mode 100644
index 38e63c761d26bfd66098dd2b0bbe6f30285526d5..0000000000000000000000000000000000000000
--- a/docker/centos/binary/glance/glance-base/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install openstack-glance python-oslo-i18n && yum clean all
diff --git a/docker/centos/binary/glance/glance-base/build b/docker/centos/binary/glance/glance-base/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/glance/glance-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/glance/glance-registry/Dockerfile b/docker/centos/binary/glance/glance-registry/Dockerfile
deleted file mode 100644
index 11b584eed6def0daaa9f66f94e4fec9488a66cb9..0000000000000000000000000000000000000000
--- a/docker/centos/binary/glance/glance-registry/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY config-external.sh /opt/kolla/
-
-COPY ./start.sh /start.sh
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/glance/glance-registry/build b/docker/centos/binary/glance/glance-registry/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/glance/glance-registry/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/glance/glance-registry/config-external.sh b/docker/centos/binary/glance/glance-registry/config-external.sh
deleted file mode 120000
index cfcbd13914d26b1e8f2f11c1a4b54972257d7f5b..0000000000000000000000000000000000000000
--- a/docker/centos/binary/glance/glance-registry/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/glance/glance-registry/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/glance/glance-registry/start.sh b/docker/centos/binary/glance/glance-registry/start.sh
deleted file mode 120000
index 1295cdc3140a523560c371c2786734f163333d75..0000000000000000000000000000000000000000
--- a/docker/centos/binary/glance/glance-registry/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/glance/glance-registry/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/gnocchi/gnocchi-api/Dockerfile b/docker/centos/binary/gnocchi/gnocchi-api/Dockerfile
deleted file mode 100644
index eee474e374dd9c628c294a1c10b0813642e4febd..0000000000000000000000000000000000000000
--- a/docker/centos/binary/gnocchi/gnocchi-api/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%gnocchi-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum install -y openstack-gnocchi-api \
-    openstack-gnocchi-carbonara \
-    openstack-gnocchi-indexer-sqlalchemy \
-    && yum clean all
-
-COPY start.sh /
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/gnocchi/gnocchi-api/build b/docker/centos/binary/gnocchi/gnocchi-api/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/gnocchi/gnocchi-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/gnocchi/gnocchi-api/config-external.sh b/docker/centos/binary/gnocchi/gnocchi-api/config-external.sh
deleted file mode 120000
index 471d03664b9b6a373dc0219639b3f565abfdb0d4..0000000000000000000000000000000000000000
--- a/docker/centos/binary/gnocchi/gnocchi-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/gnocchi/gnocchi-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/gnocchi/gnocchi-api/start.sh b/docker/centos/binary/gnocchi/gnocchi-api/start.sh
deleted file mode 120000
index 99320c6d03160e7aa6914a6cbf962e14b1a7c790..0000000000000000000000000000000000000000
--- a/docker/centos/binary/gnocchi/gnocchi-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/gnocchi/gnocchi-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/gnocchi/gnocchi-base/Dockerfile b/docker/centos/binary/gnocchi/gnocchi-base/Dockerfile
deleted file mode 100644
index 30c8fbae326a99d92711d52b2484621ed20826cb..0000000000000000000000000000000000000000
--- a/docker/centos/binary/gnocchi/gnocchi-base/Dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
diff --git a/docker/centos/binary/gnocchi/gnocchi-base/build b/docker/centos/binary/gnocchi/gnocchi-base/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/gnocchi/gnocchi-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/gnocchi/gnocchi-statsd/Dockerfile b/docker/centos/binary/gnocchi/gnocchi-statsd/Dockerfile
deleted file mode 100644
index 354c312d05f7329709be02f1a9dacc622e1744d2..0000000000000000000000000000000000000000
--- a/docker/centos/binary/gnocchi/gnocchi-statsd/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%gnocchi-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum install -y openstack-gnocchi-statsd && yum clean all
-
-COPY start.sh /
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/gnocchi/gnocchi-statsd/build b/docker/centos/binary/gnocchi/gnocchi-statsd/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/gnocchi/gnocchi-statsd/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/gnocchi/gnocchi-statsd/config-external.sh b/docker/centos/binary/gnocchi/gnocchi-statsd/config-external.sh
deleted file mode 120000
index fe516e42ce08787dbcdbc6d4bb5d2ae5cb0f2a14..0000000000000000000000000000000000000000
--- a/docker/centos/binary/gnocchi/gnocchi-statsd/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/gnocchi/gnocchi-statsd/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/gnocchi/gnocchi-statsd/start.sh b/docker/centos/binary/gnocchi/gnocchi-statsd/start.sh
deleted file mode 120000
index ad961553e2b04db7aeb5e72466f163a83b109170..0000000000000000000000000000000000000000
--- a/docker/centos/binary/gnocchi/gnocchi-statsd/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/gnocchi/gnocchi-statsd/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/haproxy/Dockerfile b/docker/centos/binary/haproxy/Dockerfile
deleted file mode 100755
index 8e1a05f18a19fc5f859c409770a7bd75cf9d17f7..0000000000000000000000000000000000000000
--- a/docker/centos/binary/haproxy/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-        haproxy \
-    && yum clean all
-
-COPY start.sh /
-COPY config-external.sh ensure_latest_config.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/haproxy/build b/docker/centos/binary/haproxy/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/centos/binary/haproxy/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/haproxy/config-external.sh b/docker/centos/binary/haproxy/config-external.sh
deleted file mode 120000
index 75dc2b408772cd36b2b2ce552e012f89196ebd35..0000000000000000000000000000000000000000
--- a/docker/centos/binary/haproxy/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/haproxy/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/haproxy/ensure_latest_config.sh b/docker/centos/binary/haproxy/ensure_latest_config.sh
deleted file mode 120000
index 80c50f32a0992c5c9108af34f368f8ceef30c017..0000000000000000000000000000000000000000
--- a/docker/centos/binary/haproxy/ensure_latest_config.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/haproxy/ensure_latest_config.sh
\ No newline at end of file
diff --git a/docker/centos/binary/haproxy/start.sh b/docker/centos/binary/haproxy/start.sh
deleted file mode 120000
index 9b9c71e73f91a893b4622e738a71ae6693261984..0000000000000000000000000000000000000000
--- a/docker/centos/binary/haproxy/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/haproxy/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-api-cfn/Dockerfile b/docker/centos/binary/heat/heat-api-cfn/Dockerfile
deleted file mode 100644
index bfd2fe0bc2cdb6aa142924ea0d42e46e7d057124..0000000000000000000000000000000000000000
--- a/docker/centos/binary/heat/heat-api-cfn/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-    openstack-heat-api-cfn \
-    python-openstackclient \
-    && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/heat/heat-api-cfn/build b/docker/centos/binary/heat/heat-api-cfn/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/heat/heat-api-cfn/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-api-cfn/config-external.sh b/docker/centos/binary/heat/heat-api-cfn/config-external.sh
deleted file mode 120000
index d1d0848001d1635a5ddba0ed5a242199a753ec09..0000000000000000000000000000000000000000
--- a/docker/centos/binary/heat/heat-api-cfn/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-api-cfn/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-api-cfn/start.sh b/docker/centos/binary/heat/heat-api-cfn/start.sh
deleted file mode 120000
index a71201d4b03c2b9a6428e71de358a811be9a8db7..0000000000000000000000000000000000000000
--- a/docker/centos/binary/heat/heat-api-cfn/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-api-cfn/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-api/Dockerfile b/docker/centos/binary/heat/heat-api/Dockerfile
deleted file mode 100644
index 6f77186831f125881e237c168d44e6d36aabf384..0000000000000000000000000000000000000000
--- a/docker/centos/binary/heat/heat-api/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-# TODO: configure cfn and cloudwatch
-# TODO: remove python-openstackclient once crux feature is added in start.sh
-RUN yum -y install \
-    openstack-heat-api \
-    python-openstackclient \
-    && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/heat/heat-api/build b/docker/centos/binary/heat/heat-api/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/heat/heat-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-api/config-external.sh b/docker/centos/binary/heat/heat-api/config-external.sh
deleted file mode 120000
index bfc23ba3540a76dac94f674b7cb0a84a6dab9e06..0000000000000000000000000000000000000000
--- a/docker/centos/binary/heat/heat-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-api/start.sh b/docker/centos/binary/heat/heat-api/start.sh
deleted file mode 120000
index cf3eb022cd27cef106f16da3818171d098064dcb..0000000000000000000000000000000000000000
--- a/docker/centos/binary/heat/heat-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-base/Dockerfile b/docker/centos/binary/heat/heat-base/Dockerfile
deleted file mode 100644
index f66e130e3c1093643d067f8189db7bee6df584f5..0000000000000000000000000000000000000000
--- a/docker/centos/binary/heat/heat-base/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-    python-oslo-reports \
-    && yum clean all
diff --git a/docker/centos/binary/heat/heat-base/build b/docker/centos/binary/heat/heat-base/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/heat/heat-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-engine/Dockerfile b/docker/centos/binary/heat/heat-engine/Dockerfile
deleted file mode 100644
index 37cf7fb2c1b3770c9ac7bbe321eff8506525c3ab..0000000000000000000000000000000000000000
--- a/docker/centos/binary/heat/heat-engine/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-    # until http://pkgs.fedoraproject.org/cgit/openstack-heat.git/tree/openstack-heat.spec#n248 \
-    # is updated, the clients must remain here: \
-    python-barbicanclient \
-    python-zaqarclient \
-    openstack-heat-engine \
-    && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/heat/heat-engine/build b/docker/centos/binary/heat/heat-engine/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/heat/heat-engine/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-engine/config-external.sh b/docker/centos/binary/heat/heat-engine/config-external.sh
deleted file mode 120000
index a620c9e5bae2e6ac89971f8b0971f2b2016db1be..0000000000000000000000000000000000000000
--- a/docker/centos/binary/heat/heat-engine/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-engine/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-engine/start.sh b/docker/centos/binary/heat/heat-engine/start.sh
deleted file mode 120000
index d660bc5d116a4647d67b51a689a1837f56d6d44a..0000000000000000000000000000000000000000
--- a/docker/centos/binary/heat/heat-engine/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-engine/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/horizon/Dockerfile b/docker/centos/binary/horizon/Dockerfile
deleted file mode 100644
index dfd0f0ff099f725a78f1e7dd9e5dab466f0d9f9a..0000000000000000000000000000000000000000
--- a/docker/centos/binary/horizon/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-    openstack-dashboard \
-    httpd \
-    mod_wsgi \
-    && yum clean all \
-    && chown -R apache:apache /usr/share/openstack-dashboard/static
-
-# The chown is required because of this packaging bug:
-# https://bugzilla.redhat.com/show_bug.cgi?id=1219006
-
-COPY config-external.sh /opt/kolla/
-COPY start.sh /
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/horizon/build b/docker/centos/binary/horizon/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/centos/binary/horizon/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/horizon/config-external.sh b/docker/centos/binary/horizon/config-external.sh
deleted file mode 120000
index 19b799f7b95a71771c2209829fa46b422ac6f57a..0000000000000000000000000000000000000000
--- a/docker/centos/binary/horizon/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/horizon/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/horizon/start.sh b/docker/centos/binary/horizon/start.sh
deleted file mode 120000
index 3c793e4f9bace9a85d7108284e117b603a3d521d..0000000000000000000000000000000000000000
--- a/docker/centos/binary/horizon/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/horizon/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/keepalived/Dockerfile b/docker/centos/binary/keepalived/Dockerfile
deleted file mode 100644
index 3e2e4fa4650d9c364aa8daf24684e614fbe2bb5b..0000000000000000000000000000000000000000
--- a/docker/centos/binary/keepalived/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-        hostname \
-        keepalived \
-        socat \
-    && yum clean all
-
-COPY start.sh check_alive.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/keepalived/build b/docker/centos/binary/keepalived/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/centos/binary/keepalived/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/keepalived/check_alive.sh b/docker/centos/binary/keepalived/check_alive.sh
deleted file mode 120000
index e9bfd9d1f78995cb01dc7004a36de9d2ab54fc8e..0000000000000000000000000000000000000000
--- a/docker/centos/binary/keepalived/check_alive.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/keepalived/check_alive.sh
\ No newline at end of file
diff --git a/docker/centos/binary/keepalived/config-external.sh b/docker/centos/binary/keepalived/config-external.sh
deleted file mode 120000
index 08cebbe79c20cf65fae53037fb3f4f0d1a5600d4..0000000000000000000000000000000000000000
--- a/docker/centos/binary/keepalived/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/keepalived/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/keepalived/start.sh b/docker/centos/binary/keepalived/start.sh
deleted file mode 120000
index 05b222220698fdb7bfe9b23704a71c85673f6dbf..0000000000000000000000000000000000000000
--- a/docker/centos/binary/keepalived/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/keepalived/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/keystone/Dockerfile b/docker/centos/binary/keystone/Dockerfile
deleted file mode 100644
index 11cef4d8f03ac4216c54f10a968bf5c9f9060254..0000000000000000000000000000000000000000
--- a/docker/centos/binary/keystone/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install openstack-keystone \
-        python-keystoneclient \
-        python-openstackclient \
-        httpd \
-        mod_wsgi \
-        && yum clean all
-
-RUN mkdir -p /var/www/cgi-bin/keystone /var/log/keystone
-RUN cp -a /usr/share/keystone/wsgi-keystone.conf /etc/httpd/conf.d
-RUN sed -i 's,/var/log/apache2,/var/log/httpd,' /etc/httpd/conf.d/wsgi-keystone.conf
-RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
-RUN cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/main
-RUN cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/admin
-RUN chown -R keystone: /var/www/cgi-bin/keystone
-RUN chmod 755 /var/www/cgi-bin/keystone/*
-
-# Add start-up and check scripts
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-# Run the Keystone start script
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/keystone/build b/docker/centos/binary/keystone/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/centos/binary/keystone/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/keystone/config-external.sh b/docker/centos/binary/keystone/config-external.sh
deleted file mode 120000
index ae5be7eea9084ef0e11c67682dfd2d57124131fd..0000000000000000000000000000000000000000
--- a/docker/centos/binary/keystone/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/keystone/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/keystone/start.sh b/docker/centos/binary/keystone/start.sh
deleted file mode 120000
index ae34844eaba6ef4cb9a99fa6c751879566f138a7..0000000000000000000000000000000000000000
--- a/docker/centos/binary/keystone/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/keystone/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/kolla-ansible/Dockerfile b/docker/centos/binary/kolla-ansible/Dockerfile
deleted file mode 100644
index dab3861090c919b7f7157e24158c7cf1693a1eac..0000000000000000000000000000000000000000
--- a/docker/centos/binary/kolla-ansible/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-        git \
-        gcc \
-        libffi-devel \
-        libxml2-devel \
-        libxslt-devel \
-        MySQL-python \
-        openssl-devel \
-        python-devel \
-        openssh-clients \
-    && yum clean all
-
-RUN pip install -U pip wheel \
-    && pip install python-openstackclient shade
-
-RUN git clone --depth 1 https://github.com/ansible/ansible.git \
-    && cd ansible \
-    && git submodule update --init --recursive \
-    && pip install .
-
-RUN mkdir -p /etc/ansible /usr/share/ansible \
-    && echo 'localhost ansible_connection=local' > /etc/ansible/hosts
-
-COPY kolla_keystone_service.py kolla_keystone_user.py /usr/share/ansible/
diff --git a/docker/centos/binary/kolla-ansible/build b/docker/centos/binary/kolla-ansible/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/centos/binary/kolla-ansible/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/kolla-ansible/kolla_keystone_service.py b/docker/centos/binary/kolla-ansible/kolla_keystone_service.py
deleted file mode 120000
index 835cfdf1b441e9625d374ed0014e3d3742638aae..0000000000000000000000000000000000000000
--- a/docker/centos/binary/kolla-ansible/kolla_keystone_service.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/kolla-ansible/kolla_keystone_service.py
\ No newline at end of file
diff --git a/docker/centos/binary/kolla-ansible/kolla_keystone_user.py b/docker/centos/binary/kolla-ansible/kolla_keystone_user.py
deleted file mode 120000
index e1070edaf8afddd2466a69dcc5dd515f5d9154de..0000000000000000000000000000000000000000
--- a/docker/centos/binary/kolla-ansible/kolla_keystone_user.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/kolla-ansible/kolla_keystone_user.py
\ No newline at end of file
diff --git a/docker/centos/binary/magnum/magnum-api/Dockerfile b/docker/centos/binary/magnum/magnum-api/Dockerfile
deleted file mode 100644
index 580ceacc8fc2790faea769d1370597d4a64e2b89..0000000000000000000000000000000000000000
--- 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 ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- 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 746e2aa58d7cae872bed42521cdf3bd638ec65d5..0000000000000000000000000000000000000000
--- 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 58cc9e37c943aa2c54d3b72d3d1aedc453ccf439..0000000000000000000000000000000000000000
--- 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 9928bec888ee0731375396abffdcb7abb8246d11..0000000000000000000000000000000000000000
--- 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 ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- 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 093ca500330eaec301650b6aee7f1f9571886ff5..0000000000000000000000000000000000000000
--- 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 ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- 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 2d3f514d5575a19fa210b737997903338dc4eb7f..0000000000000000000000000000000000000000
--- 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 6818630367bc573c35f6bbebb4031ccbd139695f..0000000000000000000000000000000000000000
--- 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
diff --git a/docker/centos/binary/memcached/Dockerfile b/docker/centos/binary/memcached/Dockerfile
deleted file mode 100644
index 0e9cf86b3892a1d7b68aa433b2d24f76a13fa8c6..0000000000000000000000000000000000000000
--- a/docker/centos/binary/memcached/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install memcached && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/memcached/build b/docker/centos/binary/memcached/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/centos/binary/memcached/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/memcached/config-external.sh b/docker/centos/binary/memcached/config-external.sh
deleted file mode 120000
index 1b684c65a4a7c10a8f2ec95781ee26e4f594e16e..0000000000000000000000000000000000000000
--- a/docker/centos/binary/memcached/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../docker/common/memcached/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/memcached/start.sh b/docker/centos/binary/memcached/start.sh
deleted file mode 120000
index 93a7705bb9cef55395d8de8e4d086b5596dbee29..0000000000000000000000000000000000000000
--- a/docker/centos/binary/memcached/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/memcached/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/mongodb/Dockerfile b/docker/centos/binary/mongodb/Dockerfile
deleted file mode 100644
index e05047f02097965123569623fcae99608b373fce..0000000000000000000000000000000000000000
--- a/docker/centos/binary/mongodb/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install mongodb mongodb-server && yum clean all
-
-RUN mkdir -p /data/db
-
-VOLUME /data/db
-VOLUME /var/log/mongodb
-
-ENTRYPOINT exec /bin/mongod --dbpath /data/db --logpath /var/log/mongodb/mongo.log --noprealloc --smallfiles
diff --git a/docker/centos/binary/mongodb/build b/docker/centos/binary/mongodb/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/centos/binary/mongodb/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/Dockerfile b/docker/centos/binary/neutron/neutron-agents/Dockerfile
deleted file mode 100644
index 546c2a2104ae0896b953c6600d7e21854d2026b6..0000000000000000000000000000000000000000
--- 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 ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- 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 0e016223ce1c0effd83a7bc742d8617518a8e661..0000000000000000000000000000000000000000
--- 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 680eee87573612fdc399a6f94f4a7374e9cfc1e7..0000000000000000000000000000000000000000
--- 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 63dad958d66a3230d6f7472e44229ff44113d33f..0000000000000000000000000000000000000000
--- 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 f4530afd99dfbabe942abeb350049652ec3555b4..0000000000000000000000000000000000000000
--- 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 8ea67959c569a4b95560e114acda412abc0fbb24..0000000000000000000000000000000000000000
--- 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 fa70dec8b1cf613702b85006cc3f940b1663fe2f..0000000000000000000000000000000000000000
--- 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 a5c3ac24a09fc5a43437bac14040aa8a3b6dbb40..0000000000000000000000000000000000000000
--- 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 0de2452ee92a3c9ad27779d337b60922747c32df..0000000000000000000000000000000000000000
--- 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 a7f24cb777691c1ba8a46fecb5330b6de1f5c545..0000000000000000000000000000000000000000
--- 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 b5a0639b495d4e4643c23b7c5c37add1f74a1992..0000000000000000000000000000000000000000
--- 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 ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- 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 08e65f4d7e04e704cf9a0aab080a05787c4ad459..0000000000000000000000000000000000000000
--- 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 5d482f515968870834df89fab267466e75b1fe80..0000000000000000000000000000000000000000
--- 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 ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- 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 6bd77d67dc24f4ecb7657b1da7bcc3fb36378dc2..0000000000000000000000000000000000000000
--- 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 9d51d3d6a116e6c944f58b2ed848dbc4fac8afcd..0000000000000000000000000000000000000000
--- 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 762f6b189fa72751ea96f615845b070ed4c47024..0000000000000000000000000000000000000000
--- 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 ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- 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 14354b71a066e8109c32f62e74e6f343433f9e99..0000000000000000000000000000000000000000
--- 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 c14edb0adf75e9795e2c65df3cd77d367e1dfe14..0000000000000000000000000000000000000000
--- 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 de80f4ff8e67ce16e7b4991d6f9959f3bdea8eae..0000000000000000000000000000000000000000
--- 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 ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- 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 b8d7792ced29db26808e34af816b8cca112dc7a8..0000000000000000000000000000000000000000
--- 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 a11ea7703f47bcc998e91cfee582ce6cbff39255..0000000000000000000000000000000000000000
--- 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
diff --git a/docker/centos/binary/nova/nova-api/Dockerfile b/docker/centos/binary/nova/nova-api/Dockerfile
deleted file mode 100644
index 751e574c3a1d8dba7c4357d17b588bf2c4112e7f..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-api/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-        openstack-nova-api && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/nova/nova-api/build b/docker/centos/binary/nova/nova-api/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-api/config-external.sh b/docker/centos/binary/nova/nova-api/config-external.sh
deleted file mode 120000
index fa9d355fe5df4832b5fcd9b70a8e8da8227ce584..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-api/start.sh b/docker/centos/binary/nova/nova-api/start.sh
deleted file mode 120000
index 12fd6f02864a5da4ad993bb650c8e0bd8a9c4096..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-base/Dockerfile b/docker/centos/binary/nova/nova-base/Dockerfile
deleted file mode 100644
index ea56129b877765bc61c1f2a8e2f1bc3203ebc3d0..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-base/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install openstack-nova-common \
-     python-keystoneclient \
-     python-cinderclient \
-     python-nova \
-     bridge-utils && yum clean all
diff --git a/docker/centos/binary/nova/nova-base/build b/docker/centos/binary/nova/nova-base/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-compute/Dockerfile b/docker/centos/binary/nova/nova-compute/Dockerfile
deleted file mode 100644
index 495e66b8451873222cab0aa633750bb44be2e192..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-compute/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install openstack-nova-compute \
-        openvswitch \
-        sysfsutils && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-VOLUME [ "/sys/fs/cgroup" ]
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/nova/nova-compute/build b/docker/centos/binary/nova/nova-compute/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-compute/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-compute/config-external.sh b/docker/centos/binary/nova/nova-compute/config-external.sh
deleted file mode 120000
index bb13b939c73cc481395e52f3cd2e26f3486c4417..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-compute/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-compute/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-compute/start.sh b/docker/centos/binary/nova/nova-compute/start.sh
deleted file mode 120000
index 830400f9ed2bc92ef363474fa04a3d78100d7f12..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-compute/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-compute/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-conductor/Dockerfile b/docker/centos/binary/nova/nova-conductor/Dockerfile
deleted file mode 100644
index b29362dc0cd8f7f3f22c9ddb12fb8f111f20912b..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-conductor/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-        openstack-nova-conductor && yum clean all
-
-COPY start.sh /
-
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/nova/nova-conductor/build b/docker/centos/binary/nova/nova-conductor/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-conductor/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-conductor/config-external.sh b/docker/centos/binary/nova/nova-conductor/config-external.sh
deleted file mode 120000
index d98f3a8751520c5d48ecb4c8443550c22e2172c7..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-conductor/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-conductor/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-conductor/start.sh b/docker/centos/binary/nova/nova-conductor/start.sh
deleted file mode 120000
index 0eb07db61089b6340f4fdcb3e1a5bfedfb2b9f15..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-conductor/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-conductor/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-consoleauth/Dockerfile b/docker/centos/binary/nova/nova-consoleauth/Dockerfile
deleted file mode 100644
index 48c5a866c6ce007d582755b6aed66dee19330719..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-consoleauth/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install openstack-nova-console && yum clean all
-
-COPY start.sh /
-
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/nova/nova-consoleauth/build b/docker/centos/binary/nova/nova-consoleauth/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-consoleauth/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-consoleauth/config-external.sh b/docker/centos/binary/nova/nova-consoleauth/config-external.sh
deleted file mode 120000
index b9d573470806a84ca8c24620665fbe38ff14b094..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-consoleauth/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-consoleauth/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-consoleauth/start.sh b/docker/centos/binary/nova/nova-consoleauth/start.sh
deleted file mode 120000
index 658be8e2a04f8397bd1eeeaf0af6bde7cfa8f409..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-consoleauth/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-consoleauth/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-libvirt/Dockerfile b/docker/centos/binary/nova/nova-libvirt/Dockerfile
deleted file mode 100644
index 856cab73e95a9c6849862799a5fc675b2542e8a2..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-libvirt/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install libvirt-daemon \
-        libguestfs \
-        qemu-system-x86 \
-        libvirt-daemon-driver-nwfilter \
-        libvirt-daemon-config-nwfilter \
-        libvirt-daemon-driver-lxc \
-        && yum clean all
-
-VOLUME [ "/sys/fs/cgroup" ]
-
-COPY start.sh /
-
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/nova/nova-libvirt/build b/docker/centos/binary/nova/nova-libvirt/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-libvirt/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-libvirt/config-external.sh b/docker/centos/binary/nova/nova-libvirt/config-external.sh
deleted file mode 120000
index e16a4f542dd52ba20d1efc810a3fe96065f89b6c..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-libvirt/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-libvirt/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-libvirt/start.sh b/docker/centos/binary/nova/nova-libvirt/start.sh
deleted file mode 120000
index 63ca58e26a48c02eedac2627227fe1f3b9362946..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-libvirt/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-libvirt/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-network/Dockerfile b/docker/centos/binary/nova/nova-network/Dockerfile
deleted file mode 100644
index 86cb3ccf839ca3eb5b769adfb2afd7207fc7abe2..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-network/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install openstack-nova-network \
-        bridge-utils initscripts && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/nova/nova-network/build b/docker/centos/binary/nova/nova-network/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-network/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-network/config-external.sh b/docker/centos/binary/nova/nova-network/config-external.sh
deleted file mode 120000
index 086eac04ec1471d711bb1ef3a16ef6da83f0f47d..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-network/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-network/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-network/start.sh b/docker/centos/binary/nova/nova-network/start.sh
deleted file mode 120000
index 89c974d808c164154992e87e72bfa0c9b63ef55f..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-network/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-network/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-novncproxy/Dockerfile b/docker/centos/binary/nova/nova-novncproxy/Dockerfile
deleted file mode 100644
index 9ca170a88d26c12b62532e081edca0e3a33a3208..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-novncproxy/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-    novnc openstack-nova-novncproxy && \
-    yum clean all
-
-COPY start.sh /
-
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/nova/nova-novncproxy/build b/docker/centos/binary/nova/nova-novncproxy/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-novncproxy/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-novncproxy/config-external.sh b/docker/centos/binary/nova/nova-novncproxy/config-external.sh
deleted file mode 120000
index 8d2a91810534e37fcb51788cb34710de6d6b6b47..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-novncproxy/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-novncproxy/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-novncproxy/start.sh b/docker/centos/binary/nova/nova-novncproxy/start.sh
deleted file mode 120000
index b57c6a3189a2114d11eaa24b28871b8def16b604..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-novncproxy/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-novncproxy/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-scheduler/Dockerfile b/docker/centos/binary/nova/nova-scheduler/Dockerfile
deleted file mode 100644
index db7c11769b34e169fd63186b4bbbe47a77e593b5..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-scheduler/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-        openstack-nova-scheduler && yum clean all
-
-COPY start.sh /
-
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/nova/nova-scheduler/build b/docker/centos/binary/nova/nova-scheduler/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-scheduler/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-scheduler/config-external.sh b/docker/centos/binary/nova/nova-scheduler/config-external.sh
deleted file mode 120000
index ef9c60c2946678299a326557c601c8909180f13b..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-scheduler/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-scheduler/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-scheduler/start.sh b/docker/centos/binary/nova/nova-scheduler/start.sh
deleted file mode 120000
index b73e07a6a7d6aecc7678424f383cf40645b9728e..0000000000000000000000000000000000000000
--- a/docker/centos/binary/nova/nova-scheduler/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-scheduler/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/openvswitch/ovs-base/Dockerfile b/docker/centos/binary/openvswitch/ovs-base/Dockerfile
deleted file mode 100644
index 7d4ade54cda0663dffe2e1e5364a9705f023eebe..0000000000000000000000000000000000000000
--- a/docker/centos/binary/openvswitch/ovs-base/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum install -y openvswitch \
-    && yum clean all
diff --git a/docker/centos/binary/openvswitch/ovs-base/build b/docker/centos/binary/openvswitch/ovs-base/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/openvswitch/ovs-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile b/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile
deleted file mode 100644
index 8dcc5dc670a0e1a01624b878c574458e9be9b5de..0000000000000000000000000000000000000000
--- a/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ovs-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/openvswitch/ovs-db-server/build b/docker/centos/binary/openvswitch/ovs-db-server/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/openvswitch/ovs-db-server/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/openvswitch/ovs-db-server/config-external.sh b/docker/centos/binary/openvswitch/ovs-db-server/config-external.sh
deleted file mode 120000
index 36670d77d7407e0d281404e192f77f46e831b5aa..0000000000000000000000000000000000000000
--- a/docker/centos/binary/openvswitch/ovs-db-server/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/openvswitch/ovs-db-server/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/openvswitch/ovs-db-server/start.sh b/docker/centos/binary/openvswitch/ovs-db-server/start.sh
deleted file mode 120000
index 145b2426fcaec25993cb2eee22b5fd5437aba888..0000000000000000000000000000000000000000
--- a/docker/centos/binary/openvswitch/ovs-db-server/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/openvswitch/ovs-db-server/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile b/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile
deleted file mode 100644
index bb7ec8c670b65ea05404b63c26fdb56c134ee044..0000000000000000000000000000000000000000
--- a/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ovs-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-COPY ovs_ensure_configured.sh config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/build b/docker/centos/binary/openvswitch/ovs-vswitchd/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/openvswitch/ovs-vswitchd/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/config-external.sh b/docker/centos/binary/openvswitch/ovs-vswitchd/config-external.sh
deleted file mode 120000
index 39b5c7dd64d3034ddc22ef095386df0f86ea10de..0000000000000000000000000000000000000000
--- a/docker/centos/binary/openvswitch/ovs-vswitchd/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/openvswitch/ovs-vswitchd/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh b/docker/centos/binary/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh
deleted file mode 120000
index 19efaf06a1521d3534198d185d82fef6ffbfab69..0000000000000000000000000000000000000000
--- a/docker/centos/binary/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh
\ No newline at end of file
diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/start.sh b/docker/centos/binary/openvswitch/ovs-vswitchd/start.sh
deleted file mode 120000
index c1038c338b200ddcdd986a15ba8d6931a7a5ed81..0000000000000000000000000000000000000000
--- a/docker/centos/binary/openvswitch/ovs-vswitchd/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/openvswitch/ovs-vswitchd/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/rabbitmq/Dockerfile b/docker/centos/binary/rabbitmq/Dockerfile
deleted file mode 100644
index 88894c3c706214cd499fb9a855a9594c2e4ccbc8..0000000000000000000000000000000000000000
--- a/docker/centos/binary/rabbitmq/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-   hostname \
-   rabbitmq-server && \
-   yum clean all && \
-   /usr/lib/rabbitmq/bin/rabbitmq-plugins enable rabbitmq_management \
- && rm -rf /var/lib/rabbitmq/*
-
-COPY config-rabbit.sh config-external.sh /opt/kolla/
-COPY start.sh /
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/rabbitmq/build b/docker/centos/binary/rabbitmq/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/centos/binary/rabbitmq/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/rabbitmq/config-external.sh b/docker/centos/binary/rabbitmq/config-external.sh
deleted file mode 120000
index e02e664c8e92db17ac6905f6376942579943112e..0000000000000000000000000000000000000000
--- a/docker/centos/binary/rabbitmq/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/rabbitmq/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/rabbitmq/config-rabbit.sh b/docker/centos/binary/rabbitmq/config-rabbit.sh
deleted file mode 120000
index 6feee2aba4d747c529a23058c0ad902cf5a12b65..0000000000000000000000000000000000000000
--- a/docker/centos/binary/rabbitmq/config-rabbit.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/rabbitmq/config-rabbit.sh
\ No newline at end of file
diff --git a/docker/centos/binary/rabbitmq/start.sh b/docker/centos/binary/rabbitmq/start.sh
deleted file mode 120000
index 035f55e267c70eebbd8d0db7b259beb91f85f96b..0000000000000000000000000000000000000000
--- a/docker/centos/binary/rabbitmq/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/rabbitmq/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-account-server/Dockerfile b/docker/centos/binary/swift/swift-account-server/Dockerfile
deleted file mode 100644
index 3ceac3a6331f81faf70857b772188cfb80f9d70a..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-account-server/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-        openstack-swift-account \
-    && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-account-server/build b/docker/centos/binary/swift/swift-account-server/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-account-server/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-account-server/config-external.sh b/docker/centos/binary/swift/swift-account-server/config-external.sh
deleted file mode 120000
index 93a15ca3b87fc1d4dbea2b6338ad48fc18b7918e..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-account-server/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-account-server/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-account-server/start.sh b/docker/centos/binary/swift/swift-account-server/start.sh
deleted file mode 120000
index acf6b18d74320c38b492d6b1bb3f02ab69f7b758..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-account-server/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-account-server/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-base/Dockerfile b/docker/centos/binary/swift/swift-base/Dockerfile
deleted file mode 100644
index d31f9ebf6b916d5604ca8358ee0a2eaf339526c4..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-base/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install openstack-swift && yum clean all
-
-COPY config-swift.sh build-swift-ring.py /opt/kolla/
-
-RUN mkdir /opt/swift
diff --git a/docker/centos/binary/swift/swift-base/build b/docker/centos/binary/swift/swift-base/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-base/config-swift.sh b/docker/centos/binary/swift/swift-base/config-swift.sh
deleted file mode 120000
index fb883f48295b1329948e681f4f0cd4975a01b0cd..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-base/config-swift.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-base/config-swift.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-container-server/Dockerfile b/docker/centos/binary/swift/swift-container-server/Dockerfile
deleted file mode 100644
index c370032d176f50f4a54a4cccbb1f0360c3a5c291..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-container-server/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-        openstack-swift-container \
-    && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-container-server/build b/docker/centos/binary/swift/swift-container-server/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-container-server/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-container-server/config-external.sh b/docker/centos/binary/swift/swift-container-server/config-external.sh
deleted file mode 120000
index 8fa814ca7115d5ae6adccffe3f18612032733a73..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-container-server/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-container-server/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-container-server/start.sh b/docker/centos/binary/swift/swift-container-server/start.sh
deleted file mode 120000
index b7d3cd9fc1b3748ceffcecb6e3284dc11f807549..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-container-server/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-container-server/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-auditor/Dockerfile b/docker/centos/binary/swift/swift-object-auditor/Dockerfile
deleted file mode 100644
index eb070cce94e9db96443b19bf8e1dd5a1ced9f009..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-auditor/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-object-auditor/build b/docker/centos/binary/swift/swift-object-auditor/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-auditor/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-auditor/config-external.sh b/docker/centos/binary/swift/swift-object-auditor/config-external.sh
deleted file mode 120000
index 1adf26bcb3949525f31d1dec7144f3a1d47ce52f..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-auditor/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-auditor/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-auditor/start.sh b/docker/centos/binary/swift/swift-object-auditor/start.sh
deleted file mode 120000
index 5ef3165595c89b09ac24965011bf1ee98dea41a6..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-auditor/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-auditor/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-base/Dockerfile b/docker/centos/binary/swift/swift-object-base/Dockerfile
deleted file mode 100644
index c41502e6c95761ae3abd418ae9f5c775f56283cd..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-base/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-        openstack-swift-object \
-    && yum clean all
-
-COPY config-swift-object.sh /opt/kolla/
diff --git a/docker/centos/binary/swift/swift-object-base/build b/docker/centos/binary/swift/swift-object-base/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-base/config-swift-object.sh b/docker/centos/binary/swift/swift-object-base/config-swift-object.sh
deleted file mode 120000
index a289b4d0de42879a7b8b85bc8ce4a02499ed9b5f..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-base/config-swift-object.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-base/config-swift-object.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-expirer/Dockerfile b/docker/centos/binary/swift/swift-object-expirer/Dockerfile
deleted file mode 100644
index 3f3b941c728a574907d532e28315675e3557ebba..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-expirer/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-        openstack-swift-proxy \
-        openstack-swift-container \
-    && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-object-expirer/build b/docker/centos/binary/swift/swift-object-expirer/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-expirer/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-expirer/config-external.sh b/docker/centos/binary/swift/swift-object-expirer/config-external.sh
deleted file mode 120000
index 7f8d3e37e652ef8390d5bf5a94728c5578fe9703..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-expirer/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-expirer/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-expirer/start.sh b/docker/centos/binary/swift/swift-object-expirer/start.sh
deleted file mode 120000
index 3b9a9c3ee9e8f56fc35c6e4f4f8e3cb8c89879f6..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-expirer/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-expirer/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-replicator/Dockerfile b/docker/centos/binary/swift/swift-object-replicator/Dockerfile
deleted file mode 100644
index eb070cce94e9db96443b19bf8e1dd5a1ced9f009..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-replicator/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-object-replicator/build b/docker/centos/binary/swift/swift-object-replicator/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-replicator/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-replicator/config-external.sh b/docker/centos/binary/swift/swift-object-replicator/config-external.sh
deleted file mode 120000
index 69e793df4af718e30f35829a6333e236b0f0630f..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-replicator/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-replicator/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-replicator/start.sh b/docker/centos/binary/swift/swift-object-replicator/start.sh
deleted file mode 120000
index da27b631234209ab7137c1b2e2cd85a8f2e3359c..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-replicator/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-replicator/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-server/Dockerfile b/docker/centos/binary/swift/swift-object-server/Dockerfile
deleted file mode 100644
index eb070cce94e9db96443b19bf8e1dd5a1ced9f009..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-server/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-object-server/build b/docker/centos/binary/swift/swift-object-server/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-server/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-server/config-external.sh b/docker/centos/binary/swift/swift-object-server/config-external.sh
deleted file mode 120000
index a9213fffa16e35f5a20ad4fc0efad3ded84466ce..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-server/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-server/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-server/start.sh b/docker/centos/binary/swift/swift-object-server/start.sh
deleted file mode 120000
index 7e47f8018f879ee25f26880e68f5000390558826..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-server/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-server/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-updater/Dockerfile b/docker/centos/binary/swift/swift-object-updater/Dockerfile
deleted file mode 100644
index eb070cce94e9db96443b19bf8e1dd5a1ced9f009..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-updater/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-object-updater/build b/docker/centos/binary/swift/swift-object-updater/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-updater/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-updater/config-external.sh b/docker/centos/binary/swift/swift-object-updater/config-external.sh
deleted file mode 120000
index 94ba9e60c6719ebad94d009e23ec122c009bf272..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-updater/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-updater/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-updater/start.sh b/docker/centos/binary/swift/swift-object-updater/start.sh
deleted file mode 120000
index 2e78e5c09550275ed61e38b91222342a981383a1..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-object-updater/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-updater/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-proxy-server/Dockerfile b/docker/centos/binary/swift/swift-proxy-server/Dockerfile
deleted file mode 100644
index 2cc54e9387cf1f89d1eabaeb8035ad94888d9463..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-proxy-server/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install openstack-swift-proxy && yum clean all
-
-COPY ./start.sh /start.sh
-
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-proxy-server/build b/docker/centos/binary/swift/swift-proxy-server/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-proxy-server/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-proxy-server/config-external.sh b/docker/centos/binary/swift/swift-proxy-server/config-external.sh
deleted file mode 120000
index 178516af5f50c8363fd5a8dabeadcad14d49ad0a..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-proxy-server/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-proxy-server/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-proxy-server/start.sh b/docker/centos/binary/swift/swift-proxy-server/start.sh
deleted file mode 120000
index 63d0ec91af86053e96ca363ddd961514958a4835..0000000000000000000000000000000000000000
--- a/docker/centos/binary/swift/swift-proxy-server/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-proxy-server/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/zaqar/Dockerfile b/docker/centos/binary/zaqar/Dockerfile
deleted file mode 100644
index cb6217d262c645c9bd5e94bb2cd9c4857fd5ba35..0000000000000000000000000000000000000000
--- a/docker/centos/binary/zaqar/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install openstack-zaqar && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/zaqar/build b/docker/centos/binary/zaqar/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/centos/binary/zaqar/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/zaqar/config-external.sh b/docker/centos/binary/zaqar/config-external.sh
deleted file mode 120000
index 38fff40d1e8d273f505bd0223f9897b5de044dd9..0000000000000000000000000000000000000000
--- a/docker/centos/binary/zaqar/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/zaqar/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/zaqar/start.sh b/docker/centos/binary/zaqar/start.sh
deleted file mode 120000
index 48134a04428cc67396785bf29573884406ea72c0..0000000000000000000000000000000000000000
--- a/docker/centos/binary/zaqar/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/zaqar/start.sh
\ No newline at end of file
diff --git a/docker/centos/rdo b/docker/centos/rdo
deleted file mode 120000
index cab89b7b47cc051984e4409bbc4521643d53cd7a..0000000000000000000000000000000000000000
--- a/docker/centos/rdo
+++ /dev/null
@@ -1 +0,0 @@
-binary
\ No newline at end of file
diff --git a/docker/centos/source/base/Dockerfile b/docker/centos/source/base/Dockerfile
deleted file mode 100644
index 43e8d1a76fb89b94bed0393d43aec8924f946b6b..0000000000000000000000000000000000000000
--- a/docker/centos/source/base/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-FROM centos
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-# Dependencies required for building/installing source components
-RUN yum install -y \
-    epel-release \
-    gcc \
-    gcc-c++ \
-    git \
-    libffi-devel \
-    libxml2-devel \
-    libxslt-devel \
-    mariadb \
-    mariadb-devel \
-    mysql-devel \
-    MySQL-python \
-    openldap-devel \
-    openssl \
-    openssl-devel \
-    postgresql \
-    postgresql-devel \
-    python-devel \
-    python-oslo-policy \
-    sqlite-devel \
-    tar \
-  && yum clean all
-
-RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
-    && python get-pip.py \
-    && rm get-pip.py
-
-RUN pip install --upgrade \
-    cachetools \
-    crudini \
-    pip \
-    tox
-
-COPY kolla-common.sh /opt/kolla/
diff --git a/docker/centos/source/base/build b/docker/centos/source/base/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/centos/source/base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/base/kolla-common.sh b/docker/centos/source/base/kolla-common.sh
deleted file mode 120000
index c265c62f7ae70d3fa72661782afc0be3affc49c8..0000000000000000000000000000000000000000
--- a/docker/centos/source/base/kolla-common.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/base/kolla-common.sh
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile b/docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile
deleted file mode 100644
index 86cf40d923ce4294013729b82ed94dba5cdb8689..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY ./start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/ceilometer/ceilometer-alarm/build b/docker/centos/source/ceilometer/ceilometer-alarm/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-alarm/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-alarm/config-external.sh b/docker/centos/source/ceilometer/ceilometer-alarm/config-external.sh
deleted file mode 120000
index 0a48ebf52661ad79e01f2cd5a8cc454561443294..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-alarm/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-alarm/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-alarm/start.sh b/docker/centos/source/ceilometer/ceilometer-alarm/start.sh
deleted file mode 120000
index ed3ac528d4f721cc8b11d91173619ba484ac3f2f..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-alarm/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-alarm/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-api/Dockerfile b/docker/centos/source/ceilometer/ceilometer-api/Dockerfile
deleted file mode 100644
index 5db74a0011a30658569878c0fd8bd199d2514451..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-api/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY ./start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-CMD ["/start.sh"]
diff --git a/docker/centos/source/ceilometer/ceilometer-api/build b/docker/centos/source/ceilometer/ceilometer-api/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-api/config-external.sh b/docker/centos/source/ceilometer/ceilometer-api/config-external.sh
deleted file mode 120000
index 4ea59dad76aabc40022ef51529e2a8c966eaae8e..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-api/start.sh b/docker/centos/source/ceilometer/ceilometer-api/start.sh
deleted file mode 120000
index 7acfa2cba6e19e8e859f4e4ffbb021c4ada51401..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-base/.buildinfo b/docker/centos/source/ceilometer/ceilometer-base/.buildinfo
deleted file mode 100644
index 70bd3d7d388d8ab5eaa2969586faa082d0214368..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-base/.buildinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-# Build info specific to this image. All values can be overridden in .buildconf
-
-COMPONENT=ceilometer
-SOURCE_INSTALL_AVAILABLE=1
-
-# Used for git install method
-: ${CLONE_FROM:=https://github.com/openstack/ceilometer}
-
-# Used for curl install method
-: ${TARBALL_URI:=http://tarballs.openstack.org/ceilometer/ceilometer-master.tar.gz}
diff --git a/docker/centos/source/ceilometer/ceilometer-base/Dockerfile b/docker/centos/source/ceilometer/ceilometer-base/Dockerfile
deleted file mode 100644
index 0b4e0e63d1f30c2f9d264def3fa95f1470f25dd6..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-base/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-ADD ./ceilometer.tar /
-RUN ln -s /ceilometer-* /ceilometer
-
-RUN cd /ceilometer \
-    && useradd --user-group ceilometer \
-    && pip install -r requirements.txt \
-    && pip install /ceilometer \
-    && mkdir /etc/ceilometer /var/log/ceilometer \
-    && cp -r /ceilometer/etc/* /etc/ceilometer/ \
-    && rm -rf /root/.cache
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/ceilometer/ceilometer-base/build b/docker/centos/source/ceilometer/ceilometer-base/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-central/Dockerfile b/docker/centos/source/ceilometer/ceilometer-central/Dockerfile
deleted file mode 100644
index 86cf40d923ce4294013729b82ed94dba5cdb8689..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-central/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY ./start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/ceilometer/ceilometer-central/build b/docker/centos/source/ceilometer/ceilometer-central/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-central/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-central/config-external.sh b/docker/centos/source/ceilometer/ceilometer-central/config-external.sh
deleted file mode 120000
index cfc69e75d868f0327ccffc9be88e5d3a8e65056e..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-central/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-central/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-central/start.sh b/docker/centos/source/ceilometer/ceilometer-central/start.sh
deleted file mode 120000
index 8df383cd16874e524b98cd47d3bdaa19da114833..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-central/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-central/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-collector/Dockerfile b/docker/centos/source/ceilometer/ceilometer-collector/Dockerfile
deleted file mode 100644
index 86cf40d923ce4294013729b82ed94dba5cdb8689..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-collector/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY ./start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/ceilometer/ceilometer-collector/build b/docker/centos/source/ceilometer/ceilometer-collector/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-collector/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-collector/config-external.sh b/docker/centos/source/ceilometer/ceilometer-collector/config-external.sh
deleted file mode 120000
index e16dcecc181ac4c73f5c0934c3c49d8bc5e30bd9..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-collector/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-collector/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-collector/start.sh b/docker/centos/source/ceilometer/ceilometer-collector/start.sh
deleted file mode 120000
index bea2eb09c1c3d6ab02d524767436de7f3a50d15d..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-collector/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-collector/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-compute/Dockerfile b/docker/centos/source/ceilometer/ceilometer-compute/Dockerfile
deleted file mode 100644
index 86cf40d923ce4294013729b82ed94dba5cdb8689..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-compute/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY ./start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/ceilometer/ceilometer-compute/build b/docker/centos/source/ceilometer/ceilometer-compute/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-compute/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-compute/config-external.sh b/docker/centos/source/ceilometer/ceilometer-compute/config-external.sh
deleted file mode 120000
index 1d0c728e57b4e17a3062bff31c23abde810d0534..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-compute/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-compute/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-compute/start.sh b/docker/centos/source/ceilometer/ceilometer-compute/start.sh
deleted file mode 120000
index 1118b9552d2f4c63cc113985251927cbdd52388b..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-compute/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-compute/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-notification/Dockerfile b/docker/centos/source/ceilometer/ceilometer-notification/Dockerfile
deleted file mode 100644
index 86cf40d923ce4294013729b82ed94dba5cdb8689..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-notification/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY ./start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/ceilometer/ceilometer-notification/build b/docker/centos/source/ceilometer/ceilometer-notification/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-notification/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-notification/config-external.sh b/docker/centos/source/ceilometer/ceilometer-notification/config-external.sh
deleted file mode 120000
index 12d98d9eeb894ecef7c44eac985af9659a9b15b3..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-notification/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-notification/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-notification/start.sh b/docker/centos/source/ceilometer/ceilometer-notification/start.sh
deleted file mode 120000
index 8e6d4e3374a39131c1c2c3765edd0a8a6da4b88c..0000000000000000000000000000000000000000
--- a/docker/centos/source/ceilometer/ceilometer-notification/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-notification/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-api/Dockerfile b/docker/centos/source/cinder/cinder-api/Dockerfile
deleted file mode 100644
index 99200d91078fb5a28e5f8ad212315d368ba6cf26..0000000000000000000000000000000000000000
--- a/docker/centos/source/cinder/cinder-api/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN pip install python-keystoneclient
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/cinder/cinder-api/build b/docker/centos/source/cinder/cinder-api/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/cinder/cinder-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-api/config-external.sh b/docker/centos/source/cinder/cinder-api/config-external.sh
deleted file mode 120000
index 0e9409e98672503aaf77a060b25eb8f5bf4c609d..0000000000000000000000000000000000000000
--- a/docker/centos/source/cinder/cinder-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-api/start.sh b/docker/centos/source/cinder/cinder-api/start.sh
deleted file mode 120000
index 4b6c5f104a7a293fce5b1b1bf5a57e2c58d1d93a..0000000000000000000000000000000000000000
--- a/docker/centos/source/cinder/cinder-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-backup/Dockerfile b/docker/centos/source/cinder/cinder-backup/Dockerfile
deleted file mode 100644
index 70b8d8202698d38890bf7db7b9ea3c695059b983..0000000000000000000000000000000000000000
--- a/docker/centos/source/cinder/cinder-backup/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY ./start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/cinder/cinder-backup/build b/docker/centos/source/cinder/cinder-backup/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/cinder/cinder-backup/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-backup/config-external.sh b/docker/centos/source/cinder/cinder-backup/config-external.sh
deleted file mode 120000
index 4c6f65d405eb530e479d9043ab07494a1dbffc53..0000000000000000000000000000000000000000
--- a/docker/centos/source/cinder/cinder-backup/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-backup/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-backup/start.sh b/docker/centos/source/cinder/cinder-backup/start.sh
deleted file mode 120000
index 62ae41b035bf78f0f2dd2a3b0a0b7b2b16b0ef0b..0000000000000000000000000000000000000000
--- a/docker/centos/source/cinder/cinder-backup/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-backup/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-base/.buildinfo b/docker/centos/source/cinder/cinder-base/.buildinfo
deleted file mode 100644
index 05cb8abab11bc9cf1a2616e52ea077e3b8f3ed04..0000000000000000000000000000000000000000
--- a/docker/centos/source/cinder/cinder-base/.buildinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-# Build info specific to this image. All values can be overridden in .buildconf
-
-COMPONENT=cinder
-SOURCE_INSTALL_AVAILABLE=1
-
-# Used for git install method
-: ${CLONE_FROM:=https://github.com/openstack/cinder}
-
-# Used for curl install method
-: ${TARBALL_URI:=http://tarballs.openstack.org/cinder/cinder-master.tar.gz}
diff --git a/docker/centos/source/cinder/cinder-base/Dockerfile b/docker/centos/source/cinder/cinder-base/Dockerfile
deleted file mode 100644
index 209895b17adfc0bb374a64d86a04e08e9bca7743..0000000000000000000000000000000000000000
--- a/docker/centos/source/cinder/cinder-base/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-ADD ./cinder.tar /
-RUN ln -s /cinder-* /cinder
-
-RUN yum -y install lvm2 \
-    && yum clean all \
-    && cd /cinder \
-    && useradd --user-group cinder \
-    && pip install -r requirements.txt \
-    && pip install /cinder \
-    && mkdir /etc/cinder /var/log/cinder \
-    && cp -r /cinder/etc/cinder/* /etc/cinder/ \
-    && chown -R cinder: /etc/cinder /var/log/cinder \
-    && rm -rf /root/.cache \
-    && sed -i "s|udev_rules = 1|udev_rules = 0|g" /etc/lvm/lvm.conf \
-    && sed -i "s|udev_sync = 1|udev_sync = 0|g" /etc/lvm/lvm.conf
-
-# NOTE(sdake): The sed operations make LVM tools work inside a container - see
-# https://groups.google.com/forum/#!topic/docker-user/n4Xtvsb4RAw
diff --git a/docker/centos/source/cinder/cinder-base/build b/docker/centos/source/cinder/cinder-base/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/cinder/cinder-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-scheduler/Dockerfile b/docker/centos/source/cinder/cinder-scheduler/Dockerfile
deleted file mode 100644
index 70b8d8202698d38890bf7db7b9ea3c695059b983..0000000000000000000000000000000000000000
--- a/docker/centos/source/cinder/cinder-scheduler/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY ./start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/cinder/cinder-scheduler/build b/docker/centos/source/cinder/cinder-scheduler/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/cinder/cinder-scheduler/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-scheduler/config-external.sh b/docker/centos/source/cinder/cinder-scheduler/config-external.sh
deleted file mode 120000
index f6d26aba5ba5ed74f20577712ce2ea3511b76411..0000000000000000000000000000000000000000
--- a/docker/centos/source/cinder/cinder-scheduler/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-scheduler/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-scheduler/start.sh b/docker/centos/source/cinder/cinder-scheduler/start.sh
deleted file mode 120000
index 0953c6457f407d000c341202e896fa54a3097e3b..0000000000000000000000000000000000000000
--- a/docker/centos/source/cinder/cinder-scheduler/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-scheduler/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-volume/Dockerfile b/docker/centos/source/cinder/cinder-volume/Dockerfile
deleted file mode 100644
index c7d6c94467cc72c31847d3c37771cbc71ad748be..0000000000000000000000000000000000000000
--- a/docker/centos/source/cinder/cinder-volume/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-# Install required packages
-RUN yum install -y \
-        lvm2 \
-        scsi-target-utils \
-    && yum clean all
-
-# Add start scripts
-COPY config-external.sh /opt/kolla/
-COPY start.sh /start.sh
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/cinder/cinder-volume/build b/docker/centos/source/cinder/cinder-volume/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/cinder/cinder-volume/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-volume/config-external.sh b/docker/centos/source/cinder/cinder-volume/config-external.sh
deleted file mode 120000
index abcdd6bc48b8a79867f2e05b0c60261bf9951882..0000000000000000000000000000000000000000
--- a/docker/centos/source/cinder/cinder-volume/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-volume/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-volume/start.sh b/docker/centos/source/cinder/cinder-volume/start.sh
deleted file mode 120000
index 471a5ebd7cbe190d2a66a189ef091571a246b756..0000000000000000000000000000000000000000
--- a/docker/centos/source/cinder/cinder-volume/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-volume/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/data/Dockerfile b/docker/centos/source/data/Dockerfile
deleted file mode 100644
index 63591854075a1b4e74419181a1485d066cf20fdf..0000000000000000000000000000000000000000
--- a/docker/centos/source/data/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM centos
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-CMD /bin/sleep infinity
diff --git a/docker/centos/source/data/build b/docker/centos/source/data/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/centos/source/data/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/designate/designate-api/Dockerfile b/docker/centos/source/designate/designate-api/Dockerfile
deleted file mode 100644
index eac73ff5238345270572c304763a52b4466de77d..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-api/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/designate/designate-api/build b/docker/centos/source/designate/designate-api/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/designate/designate-api/config-external.sh b/docker/centos/source/designate/designate-api/config-external.sh
deleted file mode 120000
index da641a600606b972089b3ca797bcf5856bbe8469..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/designate/designate-api/start.sh b/docker/centos/source/designate/designate-api/start.sh
deleted file mode 120000
index f96fe1a342ccf1e21a3176eea442e7dc06c12be6..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/designate/designate-backend-bind9/Dockerfile b/docker/centos/source/designate/designate-backend-bind9/Dockerfile
deleted file mode 100644
index eac73ff5238345270572c304763a52b4466de77d..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-backend-bind9/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/designate/designate-backend-bind9/build b/docker/centos/source/designate/designate-backend-bind9/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-backend-bind9/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/designate/designate-backend-bind9/config-external.sh b/docker/centos/source/designate/designate-backend-bind9/config-external.sh
deleted file mode 120000
index 98eabc775e729d96b4302a761e4153d2cd8894a4..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-backend-bind9/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-backend-bind9/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/designate/designate-backend-bind9/start.sh b/docker/centos/source/designate/designate-backend-bind9/start.sh
deleted file mode 120000
index 918411fa1a46eb9b875d7f44f985d7284958e3a5..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-backend-bind9/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-backend-bind9/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/designate/designate-base/.buildinfo b/docker/centos/source/designate/designate-base/.buildinfo
deleted file mode 100644
index de37363762f66a85aedc3572656e550122cf9347..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-base/.buildinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build info specific to this image. All values can be overridden in .buildconf
-
-COMPONENT=designate
-SOURCE_INSTALL_AVAILABLE=1
-
-# Used for git install method
-: ${CLONE_FROM:=https://github.com/openstack/designate}
-
-# Used for curl install method
-: ${TARBALL_URI:=http://tarballs.openstack.org/designate/designate-master.tar.gz}
-
diff --git a/docker/centos/source/designate/designate-base/Dockerfile b/docker/centos/source/designate/designate-base/Dockerfile
deleted file mode 100644
index f8210a432eb77e3d24406d5e9225f1a53a98f1dd..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-base/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-ADD ./designate.tar /
-RUN ln -s /designate-* /designate
-
-RUN cd /designate \
-    && useradd --user-group designate \
-    && pip install -r requirements.txt \
-    && pip install /designate \
-    && mkdir /etc/designate /var/log/designate \
-    && cp -r /designate/etc/designate/* /etc/designate/ \
-    && rm -rf /root/.cache
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/designate/designate-base/build b/docker/centos/source/designate/designate-base/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/designate/designate-central/Dockerfile b/docker/centos/source/designate/designate-central/Dockerfile
deleted file mode 100644
index eac73ff5238345270572c304763a52b4466de77d..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-central/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/designate/designate-central/build b/docker/centos/source/designate/designate-central/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-central/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/designate/designate-central/config-external.sh b/docker/centos/source/designate/designate-central/config-external.sh
deleted file mode 120000
index abe5bcd3950adca1ce10b10dae2a838f548207ed..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-central/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-central/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/designate/designate-central/start.sh b/docker/centos/source/designate/designate-central/start.sh
deleted file mode 120000
index 9e0a8c484abaf9c9b7ef17f0deac9c317005074d..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-central/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-central/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/designate/designate-mdns/Dockerfile b/docker/centos/source/designate/designate-mdns/Dockerfile
deleted file mode 100644
index eac73ff5238345270572c304763a52b4466de77d..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-mdns/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/designate/designate-mdns/build b/docker/centos/source/designate/designate-mdns/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-mdns/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/designate/designate-mdns/config-external.sh b/docker/centos/source/designate/designate-mdns/config-external.sh
deleted file mode 120000
index e450238fcca42d680fa14e914c1a02b7be1d0437..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-mdns/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-mdns/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/designate/designate-mdns/start.sh b/docker/centos/source/designate/designate-mdns/start.sh
deleted file mode 120000
index f7bf747fc5b452b89ab5751545e015b4afbf7bdc..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-mdns/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-mdns/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/designate/designate-poolmanager/Dockerfile b/docker/centos/source/designate/designate-poolmanager/Dockerfile
deleted file mode 100644
index eac73ff5238345270572c304763a52b4466de77d..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-poolmanager/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/designate/designate-poolmanager/build b/docker/centos/source/designate/designate-poolmanager/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-poolmanager/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/designate/designate-poolmanager/config-external.sh b/docker/centos/source/designate/designate-poolmanager/config-external.sh
deleted file mode 120000
index 461acb12ac8f8fc52e2bd2ac2881633846b2cc42..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-poolmanager/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-poolmanager/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/designate/designate-poolmanager/start.sh b/docker/centos/source/designate/designate-poolmanager/start.sh
deleted file mode 120000
index cc428b4fe4b91db92f363d9a9f4abb66fc733282..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-poolmanager/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-poolmanager/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/designate/designate-sink/Dockerfile b/docker/centos/source/designate/designate-sink/Dockerfile
deleted file mode 100644
index eac73ff5238345270572c304763a52b4466de77d..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-sink/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/designate/designate-sink/build b/docker/centos/source/designate/designate-sink/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-sink/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/designate/designate-sink/config-external.sh b/docker/centos/source/designate/designate-sink/config-external.sh
deleted file mode 120000
index edc94e6e434ff277012888a8d3cb415f911174e3..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-sink/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-sink/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/designate/designate-sink/start.sh b/docker/centos/source/designate/designate-sink/start.sh
deleted file mode 120000
index 751b58345d26cbfb4ca6549c8b811295099395fe..0000000000000000000000000000000000000000
--- a/docker/centos/source/designate/designate-sink/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/designate/designate-sink/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/glance/glance-api/Dockerfile b/docker/centos/source/glance/glance-api/Dockerfile
deleted file mode 100644
index c3c0fd9d130954cdf4841fa123b57cf8e1d5a605..0000000000000000000000000000000000000000
--- a/docker/centos/source/glance/glance-api/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/glance/glance-api/build b/docker/centos/source/glance/glance-api/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/glance/glance-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/glance/glance-api/config-external.sh b/docker/centos/source/glance/glance-api/config-external.sh
deleted file mode 120000
index 46a22b7b31326c6b1984567931dbc24d63f5da57..0000000000000000000000000000000000000000
--- a/docker/centos/source/glance/glance-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/glance/glance-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/glance/glance-api/start.sh b/docker/centos/source/glance/glance-api/start.sh
deleted file mode 120000
index 6740e1fe92d7ed051c1fb61229b3709afe364989..0000000000000000000000000000000000000000
--- a/docker/centos/source/glance/glance-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/glance/glance-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/glance/glance-base/.buildinfo b/docker/centos/source/glance/glance-base/.buildinfo
deleted file mode 100644
index 19c048a7e15e70fe4dd3d35ae50605329bd6bebb..0000000000000000000000000000000000000000
--- a/docker/centos/source/glance/glance-base/.buildinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-# Build info specific to this image. All values can be overridden in .buildconf
-COMPONENT=glance
-SOURCE_INSTALL_AVAILABLE=1
-
-# Used for git install method
-: ${CLONE_FROM:=https://github.com/openstack/glance}
-
-# Used for curl install method
-: ${TARBALL_URI:=http://tarballs.openstack.org/glance/glance-master.tar.gz}
diff --git a/docker/centos/source/glance/glance-base/Dockerfile b/docker/centos/source/glance/glance-base/Dockerfile
deleted file mode 100644
index b2a41c49a966059b586c20d50f1a8d5408d8b1ab..0000000000000000000000000000000000000000
--- a/docker/centos/source/glance/glance-base/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-ADD ./glance.tar /
-RUN ln -s /glance-* /glance
-
-RUN cd /glance \
-    && useradd --user-group glance \
-    && pip install -r requirements.txt \
-    && pip install /glance \
-    && mkdir /etc/glance /var/log/glance \
-    && cp -r /glance/etc/*  /etc/glance/ \
-    && chown -R glance: /etc/glance /var/log/glance \
-    && rm -rf /root/.cache
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/glance/glance-base/build b/docker/centos/source/glance/glance-base/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/glance/glance-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/glance/glance-registry/Dockerfile b/docker/centos/source/glance/glance-registry/Dockerfile
deleted file mode 100644
index 22e3fcb10ba16dbc503153377c4efab85b537f4f..0000000000000000000000000000000000000000
--- a/docker/centos/source/glance/glance-registry/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY config-external.sh /opt/kolla/
-
-COPY start.sh /
-CMD ["/start.sh"]
diff --git a/docker/centos/source/glance/glance-registry/build b/docker/centos/source/glance/glance-registry/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/glance/glance-registry/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/glance/glance-registry/config-external.sh b/docker/centos/source/glance/glance-registry/config-external.sh
deleted file mode 120000
index cfcbd13914d26b1e8f2f11c1a4b54972257d7f5b..0000000000000000000000000000000000000000
--- a/docker/centos/source/glance/glance-registry/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/glance/glance-registry/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/glance/glance-registry/start.sh b/docker/centos/source/glance/glance-registry/start.sh
deleted file mode 120000
index 1295cdc3140a523560c371c2786734f163333d75..0000000000000000000000000000000000000000
--- a/docker/centos/source/glance/glance-registry/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/glance/glance-registry/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/gnocchi/gnocchi-api/Dockerfile b/docker/centos/source/gnocchi/gnocchi-api/Dockerfile
deleted file mode 100644
index ad16c6e00a3ae44929be1ffe3e4bb8e60e16d7ef..0000000000000000000000000000000000000000
--- a/docker/centos/source/gnocchi/gnocchi-api/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%gnocchi-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/gnocchi/gnocchi-api/build b/docker/centos/source/gnocchi/gnocchi-api/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/gnocchi/gnocchi-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/gnocchi/gnocchi-api/config-external.sh b/docker/centos/source/gnocchi/gnocchi-api/config-external.sh
deleted file mode 120000
index 471d03664b9b6a373dc0219639b3f565abfdb0d4..0000000000000000000000000000000000000000
--- a/docker/centos/source/gnocchi/gnocchi-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/gnocchi/gnocchi-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/gnocchi/gnocchi-api/start.sh b/docker/centos/source/gnocchi/gnocchi-api/start.sh
deleted file mode 120000
index 99320c6d03160e7aa6914a6cbf962e14b1a7c790..0000000000000000000000000000000000000000
--- a/docker/centos/source/gnocchi/gnocchi-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/gnocchi/gnocchi-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/gnocchi/gnocchi-base/.buildinfo b/docker/centos/source/gnocchi/gnocchi-base/.buildinfo
deleted file mode 100644
index a89f3419d33e02e489fa5a8aa7fde22f991e7e73..0000000000000000000000000000000000000000
--- a/docker/centos/source/gnocchi/gnocchi-base/.buildinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-# Build info specific to this image. All values can be overridden in .buildconf
-
-COMPONENT=gnocchi
-SOURCE_INSTALL_AVAILABLE=1
-
-# Used for git install method
-: ${CLONE_FROM:=https://github.com/openstack/gnocchi}
-
-# Used for curl install method
-: ${TARBALL_URI:=http://tarballs.openstack.org/gnocchi/gnocchi-master.tar.gz}
diff --git a/docker/centos/source/gnocchi/gnocchi-base/Dockerfile b/docker/centos/source/gnocchi/gnocchi-base/Dockerfile
deleted file mode 100644
index 78bd361d87e06e12edcd0be0d94194352c734010..0000000000000000000000000000000000000000
--- a/docker/centos/source/gnocchi/gnocchi-base/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-ADD ./gnocchi.tar /
-RUN ln -s /gnocchi-* /gnocchi
-
-RUN cd /gnocchi \
-    && useradd --user-group gnocchi \
-    && pip install -r requirements.txt \
-    && pip install /gnocchi \
-    && mkdir /etc/gnocchi /var/log/gnocchi \
-    && cp -r /gnocchi/etc/gnocchi/* /etc/gnocchi/ \
-    && rm -rf /root/.cache
diff --git a/docker/centos/source/gnocchi/gnocchi-base/build b/docker/centos/source/gnocchi/gnocchi-base/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/gnocchi/gnocchi-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile b/docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile
deleted file mode 100644
index ad16c6e00a3ae44929be1ffe3e4bb8e60e16d7ef..0000000000000000000000000000000000000000
--- a/docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%gnocchi-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/gnocchi/gnocchi-statsd/build b/docker/centos/source/gnocchi/gnocchi-statsd/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/gnocchi/gnocchi-statsd/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/gnocchi/gnocchi-statsd/config-external.sh b/docker/centos/source/gnocchi/gnocchi-statsd/config-external.sh
deleted file mode 120000
index fe516e42ce08787dbcdbc6d4bb5d2ae5cb0f2a14..0000000000000000000000000000000000000000
--- a/docker/centos/source/gnocchi/gnocchi-statsd/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/gnocchi/gnocchi-statsd/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/gnocchi/gnocchi-statsd/start.sh b/docker/centos/source/gnocchi/gnocchi-statsd/start.sh
deleted file mode 120000
index ad961553e2b04db7aeb5e72466f163a83b109170..0000000000000000000000000000000000000000
--- a/docker/centos/source/gnocchi/gnocchi-statsd/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/gnocchi/gnocchi-statsd/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-api-cfn/Dockerfile b/docker/centos/source/heat/heat-api-cfn/Dockerfile
deleted file mode 100644
index fb0d48115191a7334171c882c99f9cf738055290..0000000000000000000000000000000000000000
--- a/docker/centos/source/heat/heat-api-cfn/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/heat/heat-api-cfn/build b/docker/centos/source/heat/heat-api-cfn/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/heat/heat-api-cfn/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-api-cfn/config-external.sh b/docker/centos/source/heat/heat-api-cfn/config-external.sh
deleted file mode 120000
index d1d0848001d1635a5ddba0ed5a242199a753ec09..0000000000000000000000000000000000000000
--- a/docker/centos/source/heat/heat-api-cfn/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-api-cfn/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-api-cfn/start.sh b/docker/centos/source/heat/heat-api-cfn/start.sh
deleted file mode 120000
index a71201d4b03c2b9a6428e71de358a811be9a8db7..0000000000000000000000000000000000000000
--- a/docker/centos/source/heat/heat-api-cfn/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-api-cfn/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-api/Dockerfile b/docker/centos/source/heat/heat-api/Dockerfile
deleted file mode 100644
index fb0d48115191a7334171c882c99f9cf738055290..0000000000000000000000000000000000000000
--- a/docker/centos/source/heat/heat-api/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/heat/heat-api/build b/docker/centos/source/heat/heat-api/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/heat/heat-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-api/config-external.sh b/docker/centos/source/heat/heat-api/config-external.sh
deleted file mode 120000
index bfc23ba3540a76dac94f674b7cb0a84a6dab9e06..0000000000000000000000000000000000000000
--- a/docker/centos/source/heat/heat-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-api/start.sh b/docker/centos/source/heat/heat-api/start.sh
deleted file mode 120000
index cf3eb022cd27cef106f16da3818171d098064dcb..0000000000000000000000000000000000000000
--- a/docker/centos/source/heat/heat-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-base/.buildinfo b/docker/centos/source/heat/heat-base/.buildinfo
deleted file mode 100644
index 9ffa55fe4b387f607404c4171154edbf553f537f..0000000000000000000000000000000000000000
--- a/docker/centos/source/heat/heat-base/.buildinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-# Build info specific to this image. All values can be overridden in .buildconf
-
-COMPONENT=heat
-SOURCE_INSTALL_AVAILABLE=1
-
-# Used for git install method
-: ${CLONE_FROM:=https://github.com/openstack/heat}
-
-# Used for curl install method
-: ${TARBALL_URI:=http://tarballs.openstack.org/heat/heat-master.tar.gz}
diff --git a/docker/centos/source/heat/heat-base/Dockerfile b/docker/centos/source/heat/heat-base/Dockerfile
deleted file mode 100644
index 72ff595561dbdaf7c93412e1c1ef5500ac992410..0000000000000000000000000000000000000000
--- a/docker/centos/source/heat/heat-base/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-ADD ./heat.tar /
-RUN ln -s /heat-* /heat
-
-RUN cd /heat \
-    && useradd --user-group heat \
-    && pip install -r requirements.txt \
-    && pip install /heat \
-    && mkdir /etc/heat /var/log/heat \
-    && cp -r /heat/etc/heat/* /etc/heat/ \
-    && rm -rf /root/.cache
diff --git a/docker/centos/source/heat/heat-base/build b/docker/centos/source/heat/heat-base/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/heat/heat-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-engine/Dockerfile b/docker/centos/source/heat/heat-engine/Dockerfile
deleted file mode 100644
index fb0d48115191a7334171c882c99f9cf738055290..0000000000000000000000000000000000000000
--- a/docker/centos/source/heat/heat-engine/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/heat/heat-engine/build b/docker/centos/source/heat/heat-engine/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/heat/heat-engine/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-engine/config-external.sh b/docker/centos/source/heat/heat-engine/config-external.sh
deleted file mode 120000
index a620c9e5bae2e6ac89971f8b0971f2b2016db1be..0000000000000000000000000000000000000000
--- a/docker/centos/source/heat/heat-engine/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-engine/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-engine/start.sh b/docker/centos/source/heat/heat-engine/start.sh
deleted file mode 120000
index d660bc5d116a4647d67b51a689a1837f56d6d44a..0000000000000000000000000000000000000000
--- a/docker/centos/source/heat/heat-engine/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-engine/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/horizon/.buildinfo b/docker/centos/source/horizon/.buildinfo
deleted file mode 100644
index 79952ecc3bd58050d904dd2299578c05bc0a09d2..0000000000000000000000000000000000000000
--- a/docker/centos/source/horizon/.buildinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-# Build info specific to this image. All values can be overridden in .buildconf
-
-COMPONENT=horizon
-SOURCE_INSTALL_AVAILABLE=1
-
-# Used for git install method
-: ${CLONE_FROM:=https://github.com/openstack/horizon}
-
-# Used for curl install method
-: ${TARBALL_URI:=http://tarballs.openstack.org/horizon/horizon-master.tar.gz}
diff --git a/docker/centos/source/horizon/Dockerfile b/docker/centos/source/horizon/Dockerfile
deleted file mode 100644
index b2ae89a5fbacea78877c7957cade6d5426a2f5da..0000000000000000000000000000000000000000
--- a/docker/centos/source/horizon/Dockerfile
+++ /dev/null
@@ -1,36 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-ADD ./horizon.tar /
-RUN ln -s /horizon-* /horizon
-
-RUN yum install -y \
-    httpd \
-    mod_wsgi \
-  && yum clean all
-
-RUN cd /horizon \
-    && useradd --user-group horizon \
-    && pip install -r requirements.txt \
-    && pip install /horizon \
-    && mkdir -p \
-        /etc/openstack-dashboard \
-        /usr/share/openstack-dashboard/static \
-        /var/log/horizon \
-    && cp -r /horizon/openstack_dashboard /usr/share/openstack-dashboard/ \
-    && cp /horizon/openstack_dashboard/local/local_settings.py.example \
-        /etc/openstack-dashboard/local_settings \
-    && ln -s /etc/openstack-dashboard/local_settings \
-        /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py \
-    && cp /horizon/manage.py /usr/share/openstack-dashboard \
-    && python /usr/share/openstack-dashboard/manage.py collectstatic --noinput \
-    && chown -R apache:apache /usr/share/openstack-dashboard/static \
-    && rm -rf /root/.cache
-
-# The chown is required because of this packaging bug:
-# https://bugzilla.redhat.com/show_bug.cgi?id=1219006
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/horizon/build b/docker/centos/source/horizon/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/centos/source/horizon/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/horizon/config-external.sh b/docker/centos/source/horizon/config-external.sh
deleted file mode 120000
index 19b799f7b95a71771c2209829fa46b422ac6f57a..0000000000000000000000000000000000000000
--- a/docker/centos/source/horizon/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/horizon/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/horizon/start.sh b/docker/centos/source/horizon/start.sh
deleted file mode 120000
index 3c793e4f9bace9a85d7108284e117b603a3d521d..0000000000000000000000000000000000000000
--- a/docker/centos/source/horizon/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/horizon/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/keystone/.buildinfo b/docker/centos/source/keystone/.buildinfo
deleted file mode 100644
index b1ce82439041670401dfb1c9fb9ea1189dbad707..0000000000000000000000000000000000000000
--- a/docker/centos/source/keystone/.buildinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-# Build info specific to this image. All values can be overridden in .buildconf
-
-COMPONENT=keystone
-SOURCE_INSTALL_AVAILABLE=1
-
-# Used for git install method
-: ${CLONE_FROM:=https://github.com/openstack/keystone}
-
-# Used for curl install method
-: ${TARBALL_URI:=http://tarballs.openstack.org/keystone/keystone-master.tar.gz}
diff --git a/docker/centos/source/keystone/Dockerfile b/docker/centos/source/keystone/Dockerfile
deleted file mode 100644
index f83321591df408634ad809fa80d4a2c4bc8015c4..0000000000000000000000000000000000000000
--- a/docker/centos/source/keystone/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-        httpd \
-        mod_wsgi \
-        && yum clean all
-
-ADD ./keystone.tar /
-RUN ln -s /keystone-* /keystone
-
-RUN cd /keystone \
-    && useradd --user-group keystone \
-    && pip install -r requirements.txt \
-    && pip install /keystone \
-    && mkdir /etc/keystone /var/log/keystone /var/www/cgi-bin/keystone \
-    && cp /keystone/etc/keystone.conf.sample /etc/keystone/keystone.conf \
-    && cp -r /keystone/etc/* /etc/keystone/ \
-    && cp -a httpd/wsgi-keystone.conf /etc/httpd/conf.d \
-    && sed -i 's,/var/log/apache2,/var/log/httpd,' /etc/httpd/conf.d/wsgi-keystone.conf \
-    && sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
-    && cp -a httpd/keystone.py /var/www/cgi-bin/keystone/main \
-    && cp -a httpd/keystone.py /var/www/cgi-bin/keystone/admin \
-    && chown -R keystone: /var/www/cgi-bin/keystone /var/log/keystone \
-    && chmod 755 /var/www/cgi-bin/keystone/*
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/keystone/build b/docker/centos/source/keystone/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/centos/source/keystone/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/keystone/config-external.sh b/docker/centos/source/keystone/config-external.sh
deleted file mode 120000
index ae5be7eea9084ef0e11c67682dfd2d57124131fd..0000000000000000000000000000000000000000
--- a/docker/centos/source/keystone/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/keystone/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/keystone/start.sh b/docker/centos/source/keystone/start.sh
deleted file mode 120000
index ae34844eaba6ef4cb9a99fa6c751879566f138a7..0000000000000000000000000000000000000000
--- a/docker/centos/source/keystone/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/keystone/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/magnum/magnum-api/Dockerfile b/docker/centos/source/magnum/magnum-api/Dockerfile
deleted file mode 100644
index aa39615e77b668be2ce0c5efe7fa767131514d17..0000000000000000000000000000000000000000
--- a/docker/centos/source/magnum/magnum-api/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%magnum-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/magnum/magnum-api/build b/docker/centos/source/magnum/magnum-api/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/magnum/magnum-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/magnum/magnum-api/config-external.sh b/docker/centos/source/magnum/magnum-api/config-external.sh
deleted file mode 120000
index 746e2aa58d7cae872bed42521cdf3bd638ec65d5..0000000000000000000000000000000000000000
--- a/docker/centos/source/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/source/magnum/magnum-api/start.sh b/docker/centos/source/magnum/magnum-api/start.sh
deleted file mode 120000
index 58cc9e37c943aa2c54d3b72d3d1aedc453ccf439..0000000000000000000000000000000000000000
--- a/docker/centos/source/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/source/magnum/magnum-base/.buildinfo b/docker/centos/source/magnum/magnum-base/.buildinfo
deleted file mode 100644
index 95d42029a7c3323710d63feb032ff94d957aaedb..0000000000000000000000000000000000000000
--- a/docker/centos/source/magnum/magnum-base/.buildinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-# Build info specific to this image. All values can be overridden in .buildconf
-
-COMPONENT=magnum
-SOURCE_INSTALL_AVAILABLE=1
-
-# Used for git install method
-: ${CLONE_FROM:=https://github.com/openstack/magnum}
-
-# Used for curl install method
-: ${TARBALL_URI:=http://tarballs.openstack.org/magnum/magnum-master.tar.gz}
diff --git a/docker/centos/source/magnum/magnum-base/Dockerfile b/docker/centos/source/magnum/magnum-base/Dockerfile
deleted file mode 100644
index 55936981d0c09b893ff7ff4170701508981ce7ae..0000000000000000000000000000000000000000
--- a/docker/centos/source/magnum/magnum-base/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-ADD ./magnum.tar /
-RUN ln -s /magnum-* /magnum
-
-RUN cd /magnum \
-    && useradd --user-group magnum \
-    && pip install -r requirements.txt \
-    && pip install /magnum \
-    && mkdir /etc/magnum /var/log/magnum \
-    && cp -r /magnum/etc/magnum/* /etc/magnum/ \
-    && rm -rf /root/.cache
diff --git a/docker/centos/source/magnum/magnum-base/build b/docker/centos/source/magnum/magnum-base/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/magnum/magnum-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/magnum/magnum-conductor/Dockerfile b/docker/centos/source/magnum/magnum-conductor/Dockerfile
deleted file mode 100644
index 6790aeeff056dd9b5892b82527167019a0f6e2a9..0000000000000000000000000000000000000000
--- a/docker/centos/source/magnum/magnum-conductor/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%magnum-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-# 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/source/magnum/magnum-conductor/build b/docker/centos/source/magnum/magnum-conductor/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/magnum/magnum-conductor/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/magnum/magnum-conductor/config-external.sh b/docker/centos/source/magnum/magnum-conductor/config-external.sh
deleted file mode 120000
index 2d3f514d5575a19fa210b737997903338dc4eb7f..0000000000000000000000000000000000000000
--- a/docker/centos/source/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/source/magnum/magnum-conductor/start.sh b/docker/centos/source/magnum/magnum-conductor/start.sh
deleted file mode 120000
index 6818630367bc573c35f6bbebb4031ccbd139695f..0000000000000000000000000000000000000000
--- a/docker/centos/source/magnum/magnum-conductor/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/magnum/magnum-conductor/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/murano/murano-api/Dockerfile b/docker/centos/source/murano/murano-api/Dockerfile
deleted file mode 100644
index a838fa8acdee21e98c48ac49e8489af16ca62037..0000000000000000000000000000000000000000
--- a/docker/centos/source/murano/murano-api/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%murano-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY config-external.sh /opt/kolla/
-
-COPY start.sh /
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/murano/murano-api/build b/docker/centos/source/murano/murano-api/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/murano/murano-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/murano/murano-api/config-external.sh b/docker/centos/source/murano/murano-api/config-external.sh
deleted file mode 120000
index 6b73e957f59bf497fd0fd23b48dd0b354bb6703b..0000000000000000000000000000000000000000
--- a/docker/centos/source/murano/murano-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/murano/murano-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/murano/murano-api/start.sh b/docker/centos/source/murano/murano-api/start.sh
deleted file mode 120000
index bcf6f43e7f51b93f3446a062db66dfcabebe5cab..0000000000000000000000000000000000000000
--- a/docker/centos/source/murano/murano-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/murano/murano-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/murano/murano-base/.buildinfo b/docker/centos/source/murano/murano-base/.buildinfo
deleted file mode 100644
index 4806db1559b0869d500bb87971e3fc1d460787ea..0000000000000000000000000000000000000000
--- a/docker/centos/source/murano/murano-base/.buildinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-# Build info specific to this image. All values can be overridden in .buildconf
-
-COMPONENT=murano
-SOURCE_INSTALL_AVAILABLE=1
-
-# Used for git install method
-: ${CLONE_FROM:=https://github.com/openstack/murano}
-
-# Used for curl install method
-: ${TARBALL_URI:=http://tarballs.openstack.org/murano/murano-master.tar.gz}
diff --git a/docker/centos/source/murano/murano-base/Dockerfile b/docker/centos/source/murano/murano-base/Dockerfile
deleted file mode 100644
index 21de3ece3b73817ea502b5ba14d401c542208abd..0000000000000000000000000000000000000000
--- a/docker/centos/source/murano/murano-base/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-ADD ./murano.tar /
-RUN ln -s /murano-* /murano
-
-RUN cd /murano \
-    && pip install -r requirements.txt \
-    && pip install /murano \
-    && mkdir /etc/murano \
-    && cd /murano \
-    && tox -e genconfig \
-    && cp -r etc/murano/* /etc/murano/ \
-    && cp etc/murano/murano.conf.sample /etc/murano/murano.conf \
-    && rm -rf /root/.cache
diff --git a/docker/centos/source/murano/murano-base/build b/docker/centos/source/murano/murano-base/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/murano/murano-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/murano/murano-engine/Dockerfile b/docker/centos/source/murano/murano-engine/Dockerfile
deleted file mode 100644
index a838fa8acdee21e98c48ac49e8489af16ca62037..0000000000000000000000000000000000000000
--- a/docker/centos/source/murano/murano-engine/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%murano-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY config-external.sh /opt/kolla/
-
-COPY start.sh /
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/murano/murano-engine/build b/docker/centos/source/murano/murano-engine/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/murano/murano-engine/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/murano/murano-engine/config-external.sh b/docker/centos/source/murano/murano-engine/config-external.sh
deleted file mode 120000
index 1c8e0612cc433cad0299d9cb1451b3eba372526a..0000000000000000000000000000000000000000
--- a/docker/centos/source/murano/murano-engine/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/murano/murano-engine/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/murano/murano-engine/start.sh b/docker/centos/source/murano/murano-engine/start.sh
deleted file mode 120000
index a4b0147fba8d63e3402661e42bf4b399e44ffdff..0000000000000000000000000000000000000000
--- a/docker/centos/source/murano/murano-engine/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/murano/murano-engine/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/Dockerfile b/docker/centos/source/neutron/neutron-agents/Dockerfile
deleted file mode 100644
index 546c2a2104ae0896b953c6600d7e21854d2026b6..0000000000000000000000000000000000000000
--- 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 ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- 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 0e016223ce1c0effd83a7bc742d8617518a8e661..0000000000000000000000000000000000000000
--- 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 680eee87573612fdc399a6f94f4a7374e9cfc1e7..0000000000000000000000000000000000000000
--- 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 63dad958d66a3230d6f7472e44229ff44113d33f..0000000000000000000000000000000000000000
--- 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 f4530afd99dfbabe942abeb350049652ec3555b4..0000000000000000000000000000000000000000
--- 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 8ea67959c569a4b95560e114acda412abc0fbb24..0000000000000000000000000000000000000000
--- 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 fa70dec8b1cf613702b85006cc3f940b1663fe2f..0000000000000000000000000000000000000000
--- 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 a5c3ac24a09fc5a43437bac14040aa8a3b6dbb40..0000000000000000000000000000000000000000
--- 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 0de2452ee92a3c9ad27779d337b60922747c32df..0000000000000000000000000000000000000000
--- 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 a7f24cb777691c1ba8a46fecb5330b6de1f5c545..0000000000000000000000000000000000000000
--- 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 b4035affbb18a4bae4b6c754b81132da85e4e03e..0000000000000000000000000000000000000000
--- 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 ee57cfedcc7f33a73feac2b68ef1d48f9596ac66..0000000000000000000000000000000000000000
--- 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 ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- 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 08e65f4d7e04e704cf9a0aab080a05787c4ad459..0000000000000000000000000000000000000000
--- 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 ded2b7de04e406e049ce90137dd28f73f5fa9874..0000000000000000000000000000000000000000
--- 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 ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- 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 6bd77d67dc24f4ecb7657b1da7bcc3fb36378dc2..0000000000000000000000000000000000000000
--- 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 9d51d3d6a116e6c944f58b2ed848dbc4fac8afcd..0000000000000000000000000000000000000000
--- 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 4f447853b89e89e7bb3be7e5589fe10147cb3b5e..0000000000000000000000000000000000000000
--- 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 ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- 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 14354b71a066e8109c32f62e74e6f343433f9e99..0000000000000000000000000000000000000000
--- 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 c14edb0adf75e9795e2c65df3cd77d367e1dfe14..0000000000000000000000000000000000000000
--- 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 f678357a0d6b5e2541479ac89380f06d18503ba2..0000000000000000000000000000000000000000
--- 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 ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- 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 b8d7792ced29db26808e34af816b8cca112dc7a8..0000000000000000000000000000000000000000
--- 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 a11ea7703f47bcc998e91cfee582ce6cbff39255..0000000000000000000000000000000000000000
--- 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
diff --git a/docker/centos/source/nova/nova-api/Dockerfile b/docker/centos/source/nova/nova-api/Dockerfile
deleted file mode 100644
index 02626c2c29b172f78608636094be762d13ca9fea..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-api/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-api/build b/docker/centos/source/nova/nova-api/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-api/config-external.sh b/docker/centos/source/nova/nova-api/config-external.sh
deleted file mode 120000
index fa9d355fe5df4832b5fcd9b70a8e8da8227ce584..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-api/start.sh b/docker/centos/source/nova/nova-api/start.sh
deleted file mode 120000
index 12fd6f02864a5da4ad993bb650c8e0bd8a9c4096..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-base/.buildinfo b/docker/centos/source/nova/nova-base/.buildinfo
deleted file mode 100644
index 2c5f3d8131361412e11be855a064fcb41f412239..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-base/.buildinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build info specific to this image. All values can be overridden in .buildconf
-
-COMPONENT=nova
-SOURCE_INSTALL_AVAILABLE=1
-
-# Used for git install method
-: ${CLONE_FROM:=https://github.com/openstack/nova}
-
-# Used for curl install method
-# TODO(coolsvap) change to master once the changes
-# in blueprint consolidate-libvirt-fs-volume-drivers
-# Kolla bug : https://bugs.launchpad.net/kolla/+bug/1480231
-: ${TARBALL_URI:=http://tarballs.openstack.org/nova/nova-2015.1.1.tar.gz}
diff --git a/docker/centos/source/nova/nova-base/Dockerfile b/docker/centos/source/nova/nova-base/Dockerfile
deleted file mode 100644
index b15dcd20cd8715f0506fd49a142020da9f1ac2fe..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-base/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-        bridge-utils \
-    && yum clean all
-
-RUN pip install \
-    python-cinderclient \
-    python-keystoneclient
-
-ADD ./nova.tar /
-RUN ln -s /nova-* /nova
-
-RUN cd /nova \
-    && useradd --user-group nova \
-    && pip install -r requirements.txt \
-    && pip install /nova \
-    && tox -egenconfig \
-    && mkdir /etc/nova /var/log/nova \
-    && cp /nova/etc/nova/nova.conf.sample /etc/nova/nova.conf \
-    && cp -r /nova/etc/nova/* /etc/nova/ \
-    && chown -R nova: /etc/nova /var/log/nova \
-    && rm -rf /root/.cache
diff --git a/docker/centos/source/nova/nova-base/build b/docker/centos/source/nova/nova-base/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-compute/Dockerfile b/docker/centos/source/nova/nova-compute/Dockerfile
deleted file mode 100644
index 96b234a5c669697a3ad35ce8354572c8fd038f19..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-compute/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install sysfsutils \
-    libvirt-python \
-    && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-VOLUME [ "/sys/fs/cgroup" ]
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-compute/build b/docker/centos/source/nova/nova-compute/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-compute/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-compute/config-external.sh b/docker/centos/source/nova/nova-compute/config-external.sh
deleted file mode 120000
index bb13b939c73cc481395e52f3cd2e26f3486c4417..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-compute/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-compute/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-compute/start.sh b/docker/centos/source/nova/nova-compute/start.sh
deleted file mode 120000
index 830400f9ed2bc92ef363474fa04a3d78100d7f12..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-compute/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-compute/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-conductor/Dockerfile b/docker/centos/source/nova/nova-conductor/Dockerfile
deleted file mode 100644
index f22d5b243109f97e321dc08131b525c35f124259..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-conductor/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-conductor/build b/docker/centos/source/nova/nova-conductor/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-conductor/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-conductor/config-external.sh b/docker/centos/source/nova/nova-conductor/config-external.sh
deleted file mode 120000
index d98f3a8751520c5d48ecb4c8443550c22e2172c7..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-conductor/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-conductor/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-conductor/start.sh b/docker/centos/source/nova/nova-conductor/start.sh
deleted file mode 120000
index 0eb07db61089b6340f4fdcb3e1a5bfedfb2b9f15..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-conductor/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-conductor/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-consoleauth/Dockerfile b/docker/centos/source/nova/nova-consoleauth/Dockerfile
deleted file mode 100644
index f22d5b243109f97e321dc08131b525c35f124259..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-consoleauth/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-consoleauth/build b/docker/centos/source/nova/nova-consoleauth/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-consoleauth/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-consoleauth/config-external.sh b/docker/centos/source/nova/nova-consoleauth/config-external.sh
deleted file mode 120000
index b9d573470806a84ca8c24620665fbe38ff14b094..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-consoleauth/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-consoleauth/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-consoleauth/start.sh b/docker/centos/source/nova/nova-consoleauth/start.sh
deleted file mode 120000
index 658be8e2a04f8397bd1eeeaf0af6bde7cfa8f409..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-consoleauth/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-consoleauth/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-libvirt/Dockerfile b/docker/centos/source/nova/nova-libvirt/Dockerfile
deleted file mode 100644
index 856cab73e95a9c6849862799a5fc675b2542e8a2..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-libvirt/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install libvirt-daemon \
-        libguestfs \
-        qemu-system-x86 \
-        libvirt-daemon-driver-nwfilter \
-        libvirt-daemon-config-nwfilter \
-        libvirt-daemon-driver-lxc \
-        && yum clean all
-
-VOLUME [ "/sys/fs/cgroup" ]
-
-COPY start.sh /
-
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-libvirt/build b/docker/centos/source/nova/nova-libvirt/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-libvirt/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-libvirt/config-external.sh b/docker/centos/source/nova/nova-libvirt/config-external.sh
deleted file mode 120000
index e16a4f542dd52ba20d1efc810a3fe96065f89b6c..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-libvirt/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-libvirt/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-libvirt/start.sh b/docker/centos/source/nova/nova-libvirt/start.sh
deleted file mode 120000
index 63ca58e26a48c02eedac2627227fe1f3b9362946..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-libvirt/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-libvirt/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-network/Dockerfile b/docker/centos/source/nova/nova-network/Dockerfile
deleted file mode 100644
index c8822e917fe081cb6fecb312cad428bf53ab610f..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-network/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install initscripts && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-network/build b/docker/centos/source/nova/nova-network/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-network/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-network/config-external.sh b/docker/centos/source/nova/nova-network/config-external.sh
deleted file mode 120000
index 086eac04ec1471d711bb1ef3a16ef6da83f0f47d..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-network/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-network/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-network/start.sh b/docker/centos/source/nova/nova-network/start.sh
deleted file mode 120000
index 89c974d808c164154992e87e72bfa0c9b63ef55f..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-network/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-network/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-novncproxy/Dockerfile b/docker/centos/source/nova/nova-novncproxy/Dockerfile
deleted file mode 100644
index 69c99cdf7b474146442ffc61d7dc4340ece99240..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-novncproxy/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-        https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm \
-        novnc \
-    && yum clean all
-
-COPY start.sh /
-
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-novncproxy/build b/docker/centos/source/nova/nova-novncproxy/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-novncproxy/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-novncproxy/config-external.sh b/docker/centos/source/nova/nova-novncproxy/config-external.sh
deleted file mode 120000
index 8d2a91810534e37fcb51788cb34710de6d6b6b47..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-novncproxy/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-novncproxy/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-novncproxy/start.sh b/docker/centos/source/nova/nova-novncproxy/start.sh
deleted file mode 120000
index b57c6a3189a2114d11eaa24b28871b8def16b604..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-novncproxy/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-novncproxy/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-scheduler/Dockerfile b/docker/centos/source/nova/nova-scheduler/Dockerfile
deleted file mode 100644
index f22d5b243109f97e321dc08131b525c35f124259..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-scheduler/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-scheduler/build b/docker/centos/source/nova/nova-scheduler/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-scheduler/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-scheduler/config-external.sh b/docker/centos/source/nova/nova-scheduler/config-external.sh
deleted file mode 120000
index ef9c60c2946678299a326557c601c8909180f13b..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-scheduler/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-scheduler/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-scheduler/start.sh b/docker/centos/source/nova/nova-scheduler/start.sh
deleted file mode 120000
index b73e07a6a7d6aecc7678424f383cf40645b9728e..0000000000000000000000000000000000000000
--- a/docker/centos/source/nova/nova-scheduler/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-scheduler/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-account-server/Dockerfile b/docker/centos/source/swift/swift-account-server/Dockerfile
deleted file mode 100644
index c923e339e6ac3d9c73ac1c411ada6ec86b8e5e77..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-account-server/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-account-server/build b/docker/centos/source/swift/swift-account-server/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-account-server/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-account-server/config-external.sh b/docker/centos/source/swift/swift-account-server/config-external.sh
deleted file mode 120000
index 93a15ca3b87fc1d4dbea2b6338ad48fc18b7918e..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-account-server/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-account-server/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-account-server/start.sh b/docker/centos/source/swift/swift-account-server/start.sh
deleted file mode 120000
index acf6b18d74320c38b492d6b1bb3f02ab69f7b758..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-account-server/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-account-server/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-base/.buildinfo b/docker/centos/source/swift/swift-base/.buildinfo
deleted file mode 100644
index ca6e05edef29036eef8c6abef20c455279d1de96..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-base/.buildinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-# Build info specific to this image. All values can be overridden in .buildconf
-
-COMPONENT=swift
-SOURCE_INSTALL_AVAILABLE=1
-
-# Used for git install method
-: ${CLONE_FROM:=https://github.com/openstack/swift}
-
-# Used for curl install method
-: ${TARBALL_URI:=http://tarballs.openstack.org/swift/swift-master.tar.gz}
diff --git a/docker/centos/source/swift/swift-base/Dockerfile b/docker/centos/source/swift/swift-base/Dockerfile
deleted file mode 100644
index 2a983963b0f4201b6956a76b136128a6d406ba84..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-base/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-ADD ./swift.tar /
-RUN ln -s /swift-* /swift
-
-RUN cd /swift \
-    && useradd --user-group swift \
-    && pip install -r requirements.txt \
-    && pip install /swift \
-    && mkdir /etc/swift /var/log/swift \
-    && cp -r /swift/etc/* /etc/swift/ \
-    && rm -rf /root/.cache
-
-COPY config-swift.sh build-swift-ring.py /opt/kolla/
-
-RUN mkdir /opt/swift
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-base/build b/docker/centos/source/swift/swift-base/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-base/config-swift.sh b/docker/centos/source/swift/swift-base/config-swift.sh
deleted file mode 120000
index fb883f48295b1329948e681f4f0cd4975a01b0cd..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-base/config-swift.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-base/config-swift.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-container-server/Dockerfile b/docker/centos/source/swift/swift-container-server/Dockerfile
deleted file mode 100644
index c923e339e6ac3d9c73ac1c411ada6ec86b8e5e77..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-container-server/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-container-server/build b/docker/centos/source/swift/swift-container-server/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-container-server/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-container-server/config-external.sh b/docker/centos/source/swift/swift-container-server/config-external.sh
deleted file mode 120000
index 8fa814ca7115d5ae6adccffe3f18612032733a73..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-container-server/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-container-server/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-container-server/start.sh b/docker/centos/source/swift/swift-container-server/start.sh
deleted file mode 120000
index b7d3cd9fc1b3748ceffcecb6e3284dc11f807549..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-container-server/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-container-server/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-auditor/Dockerfile b/docker/centos/source/swift/swift-object-auditor/Dockerfile
deleted file mode 100644
index eb070cce94e9db96443b19bf8e1dd5a1ced9f009..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-auditor/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-object-auditor/build b/docker/centos/source/swift/swift-object-auditor/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-auditor/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-auditor/config-external.sh b/docker/centos/source/swift/swift-object-auditor/config-external.sh
deleted file mode 120000
index 1adf26bcb3949525f31d1dec7144f3a1d47ce52f..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-auditor/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-auditor/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-auditor/start.sh b/docker/centos/source/swift/swift-object-auditor/start.sh
deleted file mode 120000
index 5ef3165595c89b09ac24965011bf1ee98dea41a6..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-auditor/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-auditor/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-base/Dockerfile b/docker/centos/source/swift/swift-object-base/Dockerfile
deleted file mode 100644
index 600d9d65119d0347764e51e2e81ef62ab61c2b58..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-base/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY config-swift-object.sh /opt/kolla/
diff --git a/docker/centos/source/swift/swift-object-base/build b/docker/centos/source/swift/swift-object-base/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-base/config-swift-object.sh b/docker/centos/source/swift/swift-object-base/config-swift-object.sh
deleted file mode 120000
index a289b4d0de42879a7b8b85bc8ce4a02499ed9b5f..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-base/config-swift-object.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-base/config-swift-object.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-expirer/Dockerfile b/docker/centos/source/swift/swift-object-expirer/Dockerfile
deleted file mode 100644
index eb070cce94e9db96443b19bf8e1dd5a1ced9f009..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-expirer/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-object-expirer/build b/docker/centos/source/swift/swift-object-expirer/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-expirer/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-expirer/config-external.sh b/docker/centos/source/swift/swift-object-expirer/config-external.sh
deleted file mode 120000
index 7f8d3e37e652ef8390d5bf5a94728c5578fe9703..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-expirer/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-expirer/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-expirer/start.sh b/docker/centos/source/swift/swift-object-expirer/start.sh
deleted file mode 120000
index 3b9a9c3ee9e8f56fc35c6e4f4f8e3cb8c89879f6..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-expirer/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-expirer/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-replicator/Dockerfile b/docker/centos/source/swift/swift-object-replicator/Dockerfile
deleted file mode 100644
index eb070cce94e9db96443b19bf8e1dd5a1ced9f009..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-replicator/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-object-replicator/build b/docker/centos/source/swift/swift-object-replicator/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-replicator/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-replicator/config-external.sh b/docker/centos/source/swift/swift-object-replicator/config-external.sh
deleted file mode 120000
index 69e793df4af718e30f35829a6333e236b0f0630f..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-replicator/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-replicator/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-replicator/start.sh b/docker/centos/source/swift/swift-object-replicator/start.sh
deleted file mode 120000
index da27b631234209ab7137c1b2e2cd85a8f2e3359c..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-replicator/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-replicator/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-server/Dockerfile b/docker/centos/source/swift/swift-object-server/Dockerfile
deleted file mode 100644
index eb070cce94e9db96443b19bf8e1dd5a1ced9f009..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-server/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-object-server/build b/docker/centos/source/swift/swift-object-server/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-server/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-server/config-external.sh b/docker/centos/source/swift/swift-object-server/config-external.sh
deleted file mode 120000
index a9213fffa16e35f5a20ad4fc0efad3ded84466ce..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-server/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-server/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-server/start.sh b/docker/centos/source/swift/swift-object-server/start.sh
deleted file mode 120000
index 7e47f8018f879ee25f26880e68f5000390558826..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-server/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-server/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-updater/Dockerfile b/docker/centos/source/swift/swift-object-updater/Dockerfile
deleted file mode 100644
index eb070cce94e9db96443b19bf8e1dd5a1ced9f009..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-updater/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-object-updater/build b/docker/centos/source/swift/swift-object-updater/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-updater/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-updater/config-external.sh b/docker/centos/source/swift/swift-object-updater/config-external.sh
deleted file mode 120000
index 94ba9e60c6719ebad94d009e23ec122c009bf272..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-updater/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-updater/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-updater/start.sh b/docker/centos/source/swift/swift-object-updater/start.sh
deleted file mode 120000
index 2e78e5c09550275ed61e38b91222342a981383a1..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-object-updater/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-updater/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-proxy-server/Dockerfile b/docker/centos/source/swift/swift-proxy-server/Dockerfile
deleted file mode 100644
index cbd4357f31714cbc1242686ad48856397625e983..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-proxy-server/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-
-COPY ./start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-proxy-server/build b/docker/centos/source/swift/swift-proxy-server/build
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-proxy-server/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-proxy-server/config-external.sh b/docker/centos/source/swift/swift-proxy-server/config-external.sh
deleted file mode 120000
index 178516af5f50c8363fd5a8dabeadcad14d49ad0a..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-proxy-server/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-proxy-server/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-proxy-server/start.sh b/docker/centos/source/swift/swift-proxy-server/start.sh
deleted file mode 120000
index 63d0ec91af86053e96ca363ddd961514958a4835..0000000000000000000000000000000000000000
--- a/docker/centos/source/swift/swift-proxy-server/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-proxy-server/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/zaqar/.buildinfo b/docker/centos/source/zaqar/.buildinfo
deleted file mode 100644
index 5f46f8dd70a8d191aeada4c9acf4935463e222cd..0000000000000000000000000000000000000000
--- a/docker/centos/source/zaqar/.buildinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-# Build info specific to this image. All values can be overridden in .buildconf
-
-COMPONENT=zaqar
-SOURCE_INSTALL_AVAILABLE=1
-
-# Used for git install method
-: ${CLONE_FROM:=https://github.com/openstack/zaqar}
-
-# Used for curl install method
-: ${TARBALL_URI:=http://tarballs.openstack.org/zaqar/zaqar-master.tar.gz}
diff --git a/docker/centos/source/zaqar/Dockerfile b/docker/centos/source/zaqar/Dockerfile
deleted file mode 100644
index 3fee08aee7a30a03423a7683e51156d2379f8bcc..0000000000000000000000000000000000000000
--- a/docker/centos/source/zaqar/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-ADD ./zaqar.tar /
-RUN ln -s /zaqar-* /zaqar
-
-RUN cd /zaqar \
-    && useradd --user-group zaqar \
-    && pip install -r requirements.txt \
-    && pip install /zaqar \
-    && mkdir /etc/zaqar /var/log/zaqar \
-    && cp -r /zaqar/etc/* /etc/zaqar/ \
-    && rm -rf /root/.cache
-
-
-COPY ./start.sh /start.sh
-
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/zaqar/build b/docker/centos/source/zaqar/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/centos/source/zaqar/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/zaqar/config-external.sh b/docker/centos/source/zaqar/config-external.sh
deleted file mode 120000
index 38fff40d1e8d273f505bd0223f9897b5de044dd9..0000000000000000000000000000000000000000
--- a/docker/centos/source/zaqar/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/zaqar/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/zaqar/start.sh b/docker/centos/source/zaqar/start.sh
deleted file mode 120000
index 48134a04428cc67396785bf29573884406ea72c0..0000000000000000000000000000000000000000
--- a/docker/centos/source/zaqar/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/zaqar/start.sh
\ No newline at end of file
diff --git a/docker/common/mariadb-app/config-mysql.sh b/docker/common/mariadb-app/config-mysql.sh
deleted file mode 100755
index 6cc6afa7828fc71d13e8e47922efb0659877961f..0000000000000000000000000000000000000000
--- a/docker/common/mariadb-app/config-mysql.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-. /opt/kolla/kolla-common.sh
-
-: ${BIND_ADDRESS:=$PUBLIC_IP}
-: ${DB_ROOT_PASSWORD:=$DB_ROOT_PASSWORD}
-: ${DEFAULT_STORAGE_ENGINE:=innodb}
-: ${COLLATION_SERVER:=utf8_general_ci}
-: ${INIT_CONNECT:=SET NAMES utf8}
-: ${CHAR_SET_SERVER:=utf8}
-: ${INNODB_FILE_PER_TABLE:=true}
-: ${DATADIR:=/var/lib/mysql}
-: ${TEMP_FILE:='/tmp/mysql-first-time.sql'}
-
-server_cnf=/etc/my.cnf.d/server.cnf
-
-crudini --set $server_cnf mysqld bind-address $BIND_ADDRESS
-crudini --set $server_cnf mysqld default-storage-engine $DEFAULT_STORAGE_ENGINE
-crudini --set $server_cnf mysqld collation-server $COLLATION_SERVER
-crudini --set $server_cnf mysqld init-connect "'${INIT_CONNECT}'"
-crudini --set $server_cnf mysqld character-set-server $CHAR_SET_SERVER
-crudini --set $server_cnf mysqld max_connections "$MARIADB_MAX_CONNECTIONS"
-if [ "${INNODB_FILE_PER_TABLE}" == "true" ] || ["${INNODB_FILE_PER_TABLE}" == "True" ] ; then
-    crudini --set $server_cnf mysqld innodb_file_per_table 1
-fi
diff --git a/docker/common/mariadb-app/mysql-entrypoint.sh b/docker/common/mariadb-app/mysql-entrypoint.sh
deleted file mode 100755
index 6dece43cadab165fe3a6079bc351e5cc843a05d5..0000000000000000000000000000000000000000
--- a/docker/common/mariadb-app/mysql-entrypoint.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-set -e
-
-# Configure MySQL settings
-. /opt/kolla/config-mysql.sh
-
-if [ -z "$(ls -A /var/lib/mysql)" -a "${1%_safe}" = 'mysqld' ]; then
-    PATH=/usr/libexec:$PATH
-    export PATH
-
-    if [ -z "$MARIADB_ROOT_PASSWORD" ]; then
-        echo >&2 'error: database is uninitialized and MARIADB_ROOT_PASSWORD not set'
-        echo >&2 '  Did you forget to add -e MARIADB_ROOT_PASSWORD=... ?'
-        exit 1
-    fi
-
-    mysql_install_db --user=mysql --datadir="$DATADIR"
-
-    # These statements _must_ be on individual lines, and _must_ end with
-    # semicolons (no line breaks or comments are permitted).
-    # TODO proper SQL escaping on ALL the things D:
-    TEMP_FILE='/tmp/mysql-first-time.sql'
-    cat > "$TEMP_FILE" <<-EOSQL
-DELETE FROM mysql.user ;
-CREATE USER 'root'@'%' IDENTIFIED BY '${MARIADB_ROOT_PASSWORD}' ;
-GRANT ALL ON *.* TO 'root'@'%' WITH GRANT OPTION ;
-DROP DATABASE IF EXISTS test ;
-EOSQL
-
-    if [ "$MARIADB_DATABASE" ]; then
-        echo "CREATE DATABASE IF NOT EXISTS $MARIADB_DATABASE ;" >> "$TEMP_FILE"
-    fi
-
-    if [ "$MARIADB_USER" -a "$MARIADB_PASSWORD" ]; then
-        echo "CREATE USER '$MARIADB_USER'@'%' IDENTIFIED BY '$MARIADB_PASSWORD' ;" >> "$TEMP_FILE"
-
-        if [ "$MARIADB_DATABASE" ]; then
-            echo "GRANT ALL ON $MARIADB_DATABASE.* TO '$MARIADB_USER'@'%' ;" >> "$TEMP_FILE"
-        fi
-    fi
-
-    echo 'FLUSH PRIVILEGES ;' >> "$TEMP_FILE"
-
-    set -- "$@" --init-file="$TEMP_FILE"
-fi
-
-chown -R mysql:mysql "$DATADIR"
-
-exec "$@"
diff --git a/docker/fedora/binary/base/Dockerfile b/docker/fedora/binary/base/Dockerfile
deleted file mode 100644
index d4073841041d51c28203fc3bfc2337266250aeea..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/base/Dockerfile
+++ /dev/null
@@ -1,105 +0,0 @@
-FROM fedora:21
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-# Set up repositories
-RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm
-RUN yum -y install dnf dnf-plugins-core && yum clean all
-RUN dnf copr enable -y sdake/pam.noaudit
-
-
-# Update packages
-RUN yum update -y && yum clean all
-
-# Install base packages
-RUN yum install -y \
-	iproute \
-	mariadb \
-	mariadb-libs \
-	openssl \
-	openstack-utils \
-	pyparsing \
-	python-alembic \
-	python-amqp \
-	python-amqplib \
-	python-anyjson \
-	python-boto \
-	python-cheetah \
-	python-cliff \
-	python-cmd2 \
-	python-croniter \
-	python-crypto \
-	python-d2to1 \
-	python-docutils \
-	python-dogpile-cache \
-	python-dogpile-core \
-	python-empy \
-	python-eventlet \
-	python-flask \
-	python-futures \
-	python-greenlet \
-	python-httplib2 \
-	python-iso8601 \
-	python-itsdangerous \
-	python-jinja2 \
-	python-jsonpatch \
-	python-jsonpath-rw \
-	python-jsonpointer \
-	python-jsonschema \
-	python-keyring \
-	python-kombu \
-	python-ldap \
-	python-lesscpy \
-	python-lockfile \
-	python-lxml \
-	python-markdown \
-	python-memcached \
-	python-migrate \
-	python-msgpack \
-	python-netifaces \
-	python-networkx \
-	python-oauthlib \
-	python-oslo-config \
-	python-oslo-messaging \
-	python-oslo-rootwrap \
-	python-paramiko \
-	python-passlib \
-	python-paste-deploy \
-	python-pbr \
-	python-pecan \
-	python-ply \
-	python-prettytable \
-	python-psutil \
-	python-pycadf \
-	python-pygments \
-	python-pymongo \
-	python-qpid \
-	python-repoze-lru \
-	python-requests \
-	python-routes \
-	python-simplegeneric \
-	python-simplejson \
-	python-singledispatch \
-	python-six \
-	python-sqlalchemy \
-	python-stevedore \
-	python-taskflow \
-	python-versiontools \
-	python-warlock \
-	python-webob \
-	python-websockify \
-	python-webtest \
-	python-werkzeug \
-	python-wsme \
-	&& yum clean all
-
-# This is dirty like zebra.  This works around a bug in Ubuntu 14.04 LTS.  The
-# --net=host option does not work on ubuntu 14.04 because of a kernel bug.  One
-# workaround is to build pam without authentication.
-# See:
-#    https://registry.hub.docker.com/u/sequenceiq/pam/
-#
-RUN rpm -e --nodeps pam
-RUN yum -y install pam+noaudit && yum clean all
-# End dirty like zebra
-
-COPY kolla-common.sh /opt/kolla/
diff --git a/docker/fedora/binary/base/build b/docker/fedora/binary/base/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/fedora/binary/base/kolla-common.sh b/docker/fedora/binary/base/kolla-common.sh
deleted file mode 120000
index c265c62f7ae70d3fa72661782afc0be3affc49c8..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/base/kolla-common.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/base/kolla-common.sh
\ No newline at end of file
diff --git a/docker/fedora/binary/ceilometer b/docker/fedora/binary/ceilometer
deleted file mode 120000
index b9f08a71f2602387e923da0033c90fdf137960a1..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/ceilometer
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/ceilometer
\ No newline at end of file
diff --git a/docker/fedora/binary/designate b/docker/fedora/binary/designate
deleted file mode 120000
index 5090326fe5cf541668a825511c2f30a37aea56e8..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/designate
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/designate
\ No newline at end of file
diff --git a/docker/fedora/binary/galera b/docker/fedora/binary/galera
deleted file mode 120000
index c9339280cff3e5d862c5c2f4e1be0d4da2cb9c32..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/galera
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/galera
\ No newline at end of file
diff --git a/docker/fedora/binary/glance b/docker/fedora/binary/glance
deleted file mode 120000
index 4b4131254ca6fbfc52e3a470cfd474523c08b6c7..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/glance
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/glance
\ No newline at end of file
diff --git a/docker/fedora/binary/gnocchi b/docker/fedora/binary/gnocchi
deleted file mode 120000
index 0d0716860b8b66e92ad40536c2d8c830ec8dc7d2..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/gnocchi
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/gnocchi
\ No newline at end of file
diff --git a/docker/fedora/binary/haproxy b/docker/fedora/binary/haproxy
deleted file mode 120000
index 1229d611b55c27d07d2b3d0d1045b7cd6973d9ce..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/haproxy
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/haproxy
\ No newline at end of file
diff --git a/docker/fedora/binary/heat b/docker/fedora/binary/heat
deleted file mode 120000
index a675ed4cbb8d1f6babd6b11d36c0299ee45aaf2f..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/heat
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/heat
\ No newline at end of file
diff --git a/docker/fedora/binary/horizon b/docker/fedora/binary/horizon
deleted file mode 120000
index c460446ee86d980194ebf23c2c9cee72d47944bb..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/horizon
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/horizon
\ No newline at end of file
diff --git a/docker/fedora/binary/keepalived b/docker/fedora/binary/keepalived
deleted file mode 120000
index 940b565864916b7b9ea46a8908fe2f31bf588399..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/keepalived
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/keepalived
\ No newline at end of file
diff --git a/docker/fedora/binary/keystone b/docker/fedora/binary/keystone
deleted file mode 120000
index fb666c53b890647ba7fc94e2db94b5c485720597..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/keystone
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/keystone
\ No newline at end of file
diff --git a/docker/fedora/binary/magnum/magnum-api b/docker/fedora/binary/magnum/magnum-api
deleted file mode 120000
index 47a08ccacaeb23b3c2e8815d61dbfe6587d39672..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/magnum/magnum-api
+++ /dev/null
@@ -1 +0,0 @@
-../../../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
deleted file mode 100644
index 15d156932febae996291fa2a49b432dec1476b9c..0000000000000000000000000000000000000000
--- a/docker/fedora/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/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
deleted file mode 120000
index ec19138031a79efca08ea540f84f25ef77ed2f22..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/magnum/magnum-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../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
deleted file mode 120000
index ba985313994908402fd1cba53ef13abc6f950dd5..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/magnum/magnum-conductor
+++ /dev/null
@@ -1 +0,0 @@
-../../../centos/binary/magnum/magnum-conductor
\ No newline at end of file
diff --git a/docker/fedora/binary/memcached b/docker/fedora/binary/memcached
deleted file mode 120000
index 3028d65a6a2fa7a758c74a110b999434e4b05a66..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/memcached
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/memcached
\ No newline at end of file
diff --git a/docker/fedora/binary/mongodb b/docker/fedora/binary/mongodb
deleted file mode 120000
index 486f6030f4c60c8b4f8e347341be4a3fe99836f5..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/mongodb
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/mongodb
\ No newline at end of file
diff --git a/docker/fedora/binary/neutron b/docker/fedora/binary/neutron
deleted file mode 120000
index 09ccb9467b3569bb401f55ff3db0b62fb86b5442..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/neutron
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/neutron
\ No newline at end of file
diff --git a/docker/fedora/binary/nova b/docker/fedora/binary/nova
deleted file mode 120000
index f1f2d05a3011ccbac87fc0a714b67375b849b680..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/nova
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/nova
\ No newline at end of file
diff --git a/docker/fedora/binary/openvswitch b/docker/fedora/binary/openvswitch
deleted file mode 120000
index 6526ff756805d0346662ae44ed5c84b184dfa394..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/openvswitch
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/openvswitch
\ No newline at end of file
diff --git a/docker/fedora/binary/rabbitmq b/docker/fedora/binary/rabbitmq
deleted file mode 120000
index d6f927fc9f75cb862e6fc1e8401fb681db5dadc7..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/rabbitmq
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/rabbitmq
\ No newline at end of file
diff --git a/docker/fedora/binary/swift b/docker/fedora/binary/swift
deleted file mode 120000
index b4416ea0f913b79dc669cc6315e7df0d25060815..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/swift
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/swift
\ No newline at end of file
diff --git a/docker/fedora/binary/zaqar b/docker/fedora/binary/zaqar
deleted file mode 120000
index 1adc217cb24fd6ecd5e97203a6fb1480dd07dc32..0000000000000000000000000000000000000000
--- a/docker/fedora/binary/zaqar
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/zaqar
\ No newline at end of file
diff --git a/docker/fedora/rdo b/docker/fedora/rdo
deleted file mode 120000
index cab89b7b47cc051984e4409bbc4521643d53cd7a..0000000000000000000000000000000000000000
--- a/docker/fedora/rdo
+++ /dev/null
@@ -1 +0,0 @@
-binary
\ No newline at end of file
diff --git a/docker/fedora/source/base/Dockerfile b/docker/fedora/source/base/Dockerfile
deleted file mode 100644
index 0b0bcd20cb9b60a25e24a53646ecac3b49bba5c7..0000000000000000000000000000000000000000
--- a/docker/fedora/source/base/Dockerfile
+++ /dev/null
@@ -1,44 +0,0 @@
-FROM fedora:21
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-# Dependencies required for building/installing source components
-RUN yum install -y \
-    gcc \
-    git \
-    libffi-devel \
-    libxml2-devel \
-    libxslt-devel \
-    mariadb \
-    mariadb-devel \
-    mysql-devel \
-    MySQL-python \
-    openldap-devel \
-    openssl \
-    openssl-devel \
-    postgresql \
-    postgresql-devel \
-    python-devel \
-    python-oslo-policy \
-    sqlite-devel \
-    tar \
-  && yum clean all
-
-
-# the only dependencies we need from RDO in the source builds are
-# python-pip, python-cliff for crudini,
-# all of which can be pulled from pypi.
-# also the older version of pip does not have support for wheels
-# we are installing from source pip is the important for
-# most dependency installations
-# https://bugs.launchpad.net/kolla/+bug/1476760
-RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
-    && python get-pip.py \
-    && rm get-pip.py
-
-RUN pip install --upgrade \
-    cachetools \
-    crudini \
-    pip \
-    tox
-
-COPY kolla-common.sh /opt/kolla/
diff --git a/docker/fedora/source/base/build b/docker/fedora/source/base/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/fedora/source/base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/fedora/source/base/kolla-common.sh b/docker/fedora/source/base/kolla-common.sh
deleted file mode 120000
index c265c62f7ae70d3fa72661782afc0be3affc49c8..0000000000000000000000000000000000000000
--- a/docker/fedora/source/base/kolla-common.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/base/kolla-common.sh
\ No newline at end of file
diff --git a/docker/fedora/source/ceilometer b/docker/fedora/source/ceilometer
deleted file mode 120000
index f654233101737e33c5e8cc76ceb7d23d98b56d8d..0000000000000000000000000000000000000000
--- a/docker/fedora/source/ceilometer
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/source/ceilometer
\ No newline at end of file
diff --git a/docker/fedora/source/designate b/docker/fedora/source/designate
deleted file mode 120000
index 55232e59955a70fb48522ab047ef33ba27579f63..0000000000000000000000000000000000000000
--- a/docker/fedora/source/designate
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/source/designate
\ No newline at end of file
diff --git a/docker/fedora/source/glance b/docker/fedora/source/glance
deleted file mode 120000
index 9b38cfb43d1965da3a342b2977dd879114104d7b..0000000000000000000000000000000000000000
--- a/docker/fedora/source/glance
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/source/glance
\ No newline at end of file
diff --git a/docker/fedora/source/gnocchi b/docker/fedora/source/gnocchi
deleted file mode 120000
index 9b957650212cf563621af52efaa86de6e18e3794..0000000000000000000000000000000000000000
--- a/docker/fedora/source/gnocchi
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/source/gnocchi
\ No newline at end of file
diff --git a/docker/fedora/source/heat b/docker/fedora/source/heat
deleted file mode 120000
index fcc7ddf6c60a70097922fb8f0d71b373ef513094..0000000000000000000000000000000000000000
--- a/docker/fedora/source/heat
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/source/heat
\ No newline at end of file
diff --git a/docker/fedora/source/horizon b/docker/fedora/source/horizon
deleted file mode 120000
index f454ac78afdb324f5f67e1922500de69aa493c2b..0000000000000000000000000000000000000000
--- a/docker/fedora/source/horizon
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/source/horizon
\ No newline at end of file
diff --git a/docker/fedora/source/keystone b/docker/fedora/source/keystone
deleted file mode 120000
index e5b14713f4f47216c53c10041162ece821757f0c..0000000000000000000000000000000000000000
--- a/docker/fedora/source/keystone
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/source/keystone
\ No newline at end of file
diff --git a/docker/fedora/source/magnum b/docker/fedora/source/magnum
deleted file mode 120000
index 2db138bf42d9950fc6a521b4324b308f4ed1ed4c..0000000000000000000000000000000000000000
--- a/docker/fedora/source/magnum
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/source/magnum
\ No newline at end of file
diff --git a/docker/fedora/source/neutron b/docker/fedora/source/neutron
deleted file mode 120000
index ac5d21dd5199cc33759d75aec51c6080885c524d..0000000000000000000000000000000000000000
--- a/docker/fedora/source/neutron
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/source/neutron
\ No newline at end of file
diff --git a/docker/fedora/source/nova b/docker/fedora/source/nova
deleted file mode 120000
index 661bde3bbd7092954d4ea94a1242c09dd2358541..0000000000000000000000000000000000000000
--- a/docker/fedora/source/nova
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/source/nova
\ No newline at end of file
diff --git a/docker/fedora/source/swift b/docker/fedora/source/swift
deleted file mode 120000
index 0be99c84bd6858259b247fbcf950361a31093ea6..0000000000000000000000000000000000000000
--- a/docker/fedora/source/swift
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/source/swift/
\ No newline at end of file
diff --git a/docker/ol/binary/base/Dockerfile b/docker/ol/binary/base/Dockerfile
deleted file mode 100644
index 169cb5f3a991158533f209fcbee297839d0335d5..0000000000000000000000000000000000000000
--- a/docker/ol/binary/base/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM oraclelinux:7.1
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum update -y \
-    && yum install -y git \
-    && yum clean all \
-    && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
-    && python get-pip.py \
-    && rm -f get-pip.py \
-    && pip install crudini
-
-COPY kolla-common.sh /opt/kolla/
diff --git a/docker/ol/binary/base/build b/docker/ol/binary/base/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/ol/binary/base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/ol/binary/base/kolla-common.sh b/docker/ol/binary/base/kolla-common.sh
deleted file mode 120000
index c265c62f7ae70d3fa72661782afc0be3affc49c8..0000000000000000000000000000000000000000
--- a/docker/ol/binary/base/kolla-common.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/base/kolla-common.sh
\ No newline at end of file
diff --git a/docker/ol/source/base/Dockerfile b/docker/ol/source/base/Dockerfile
deleted file mode 100644
index f9a76c9bdd45caa4cb778e1ef8f0c2495d0b9ae8..0000000000000000000000000000000000000000
--- a/docker/ol/source/base/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM oraclelinux:7.1
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-# Dependencies required for building/installing source components
-RUN yum install -y \
-    MySQL-python \
-    gcc \
-    git \
-    libffi-devel \
-    mariadb \
-    openssl \
-    openssl-devel \
-    python-devel \
-    tar \
-  && yum clean all
-
-# TODO(pbourke): replace pip below with rpms once available in Oracle
-# repos
-RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
-    && python get-pip.py \
-    && rm get-pip.py
-
-RUN pip install crudini
-
-COPY kolla-common.sh /opt/kolla/
diff --git a/docker/ol/source/base/build b/docker/ol/source/base/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/ol/source/base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/ol/source/base/kolla-common.sh b/docker/ol/source/base/kolla-common.sh
deleted file mode 120000
index c265c62f7ae70d3fa72661782afc0be3affc49c8..0000000000000000000000000000000000000000
--- a/docker/ol/source/base/kolla-common.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/base/kolla-common.sh
\ No newline at end of file
diff --git a/docker/ol/source/keystone b/docker/ol/source/keystone
deleted file mode 120000
index f66ecff4eab4c32c09492ee7e0e213c7f4c519b4..0000000000000000000000000000000000000000
--- a/docker/ol/source/keystone
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/source/keystone/
\ No newline at end of file
diff --git a/docker/rhel/binary/base/Dockerfile b/docker/rhel/binary/base/Dockerfile
deleted file mode 100644
index 422875dd6a728b393ef826a188f242d65f6c491e..0000000000000000000000000000000000000000
--- a/docker/rhel/binary/base/Dockerfile
+++ /dev/null
@@ -1,92 +0,0 @@
-FROM rhel7
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum install -y \
-	mariadb-libs \
-	openstack-utils \
-	pyparsing \
-	python-alembic \
-	python-amqp \
-	python-amqplib \
-	python-anyjson \
-	python-boto \
-	python-ceilometerclient \
-	python-cheetah \
-	python-cinderclient \
-	python-cliff \
-	python-cmd2 \
-	python-croniter \
-	python-crypto \
-	python-d2to1 \
-	python-docutils \
-	python-dogpile-cache \
-	python-dogpile-core \
-	python-empy \
-	python-eventlet \
-	python-flask \
-	python-futures \
-	python-glanceclient \
-	python-greenlet \
-	python-heatclient \
-	python-httplib2 \
-	python-iso8601 \
-	python-itsdangerous \
-	python-jinja2 \
-	python-jsonpatch \
-	python-jsonpath-rw \
-	python-jsonpointer \
-	python-jsonschema \
-	python-keyring \
-	python-keystoneclient \
-	python-kombu \
-	python-lesscpy \
-	python-lockfile \
-	python-lxml \
-	python-markdown \
-	python-memcached \
-	python-ldap \
-	python-migrate \
-	python-msgpack \
-	python-netifaces \
-	python-networkx \
-	python-neutronclient \
-	python-novaclient \
-	python-oauthlib \
-	python-openstackclient \
-	python-oslo-config \
-	python-oslo-messaging \
-	python-oslo-rootwrap \
-	python-oslo-vmware \
-	python-paramiko \
-	python-passlib \
-	python-paste-deploy \
-	python-pbr \
-	python-pecan \
-	python-ply \
-	python-prettytable \
-	python-psutil \
-	python-pycadf \
-	python-pygments \
-	python-pymongo \
-	python-qpid \
-	python-repoze-lru \
-	python-requests \
-	python-routes \
-	python-saharaclient \
-	python-simplegeneric \
-	python-simplejson \
-	python-singledispatch \
-	python-six \
-	python-sqlalchemy \
-	python-stevedore \
-	python-swiftclient \
-	python-taskflow \
-	python-troveclient \
-	python-versiontools \
-	python-warlock \
-	python-webob \
-	python-websockify \
-	python-webtest \
-	python-werkzeug \
-	python-wsme \
-	&& yum clean all
diff --git a/docker/rhel/binary/base/build b/docker/rhel/binary/base/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/rhel/binary/base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/rhel/binary/base/kolla-common.sh b/docker/rhel/binary/base/kolla-common.sh
deleted file mode 120000
index c265c62f7ae70d3fa72661782afc0be3affc49c8..0000000000000000000000000000000000000000
--- a/docker/rhel/binary/base/kolla-common.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/base/kolla-common.sh
\ No newline at end of file
diff --git a/docker/rhel/binary/ceilometer b/docker/rhel/binary/ceilometer
deleted file mode 120000
index b9f08a71f2602387e923da0033c90fdf137960a1..0000000000000000000000000000000000000000
--- a/docker/rhel/binary/ceilometer
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/ceilometer
\ No newline at end of file
diff --git a/docker/rhel/binary/designate b/docker/rhel/binary/designate
deleted file mode 120000
index 5090326fe5cf541668a825511c2f30a37aea56e8..0000000000000000000000000000000000000000
--- a/docker/rhel/binary/designate
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/designate
\ No newline at end of file
diff --git a/docker/rhel/binary/glance b/docker/rhel/binary/glance
deleted file mode 120000
index 4b4131254ca6fbfc52e3a470cfd474523c08b6c7..0000000000000000000000000000000000000000
--- a/docker/rhel/binary/glance
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/glance
\ No newline at end of file
diff --git a/docker/rhel/binary/heat b/docker/rhel/binary/heat
deleted file mode 120000
index a675ed4cbb8d1f6babd6b11d36c0299ee45aaf2f..0000000000000000000000000000000000000000
--- a/docker/rhel/binary/heat
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/heat
\ No newline at end of file
diff --git a/docker/rhel/binary/horizon b/docker/rhel/binary/horizon
deleted file mode 120000
index c460446ee86d980194ebf23c2c9cee72d47944bb..0000000000000000000000000000000000000000
--- a/docker/rhel/binary/horizon
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/horizon
\ No newline at end of file
diff --git a/docker/rhel/binary/keystone b/docker/rhel/binary/keystone
deleted file mode 120000
index fb666c53b890647ba7fc94e2db94b5c485720597..0000000000000000000000000000000000000000
--- a/docker/rhel/binary/keystone
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/keystone
\ No newline at end of file
diff --git a/docker/rhel/binary/magnum b/docker/rhel/binary/magnum
deleted file mode 120000
index d5c1f84ed3c25d0c3444045fac429c504bcfcecf..0000000000000000000000000000000000000000
--- a/docker/rhel/binary/magnum
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/magnum
\ No newline at end of file
diff --git a/docker/rhel/binary/mongodb b/docker/rhel/binary/mongodb
deleted file mode 120000
index 486f6030f4c60c8b4f8e347341be4a3fe99836f5..0000000000000000000000000000000000000000
--- a/docker/rhel/binary/mongodb
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/mongodb
\ No newline at end of file
diff --git a/docker/rhel/binary/neutron b/docker/rhel/binary/neutron
deleted file mode 120000
index 09ccb9467b3569bb401f55ff3db0b62fb86b5442..0000000000000000000000000000000000000000
--- a/docker/rhel/binary/neutron
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/neutron
\ No newline at end of file
diff --git a/docker/rhel/binary/nova b/docker/rhel/binary/nova
deleted file mode 120000
index f1f2d05a3011ccbac87fc0a714b67375b849b680..0000000000000000000000000000000000000000
--- a/docker/rhel/binary/nova
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/nova
\ No newline at end of file
diff --git a/docker/rhel/binary/rabbitmq b/docker/rhel/binary/rabbitmq
deleted file mode 120000
index d6f927fc9f75cb862e6fc1e8401fb681db5dadc7..0000000000000000000000000000000000000000
--- a/docker/rhel/binary/rabbitmq
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/rabbitmq
\ No newline at end of file
diff --git a/docker/rhel/binary/swift b/docker/rhel/binary/swift
deleted file mode 120000
index b4416ea0f913b79dc669cc6315e7df0d25060815..0000000000000000000000000000000000000000
--- a/docker/rhel/binary/swift
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/swift
\ No newline at end of file
diff --git a/docker/rhel/binary/zaqar b/docker/rhel/binary/zaqar
deleted file mode 120000
index 1adc217cb24fd6ecd5e97203a6fb1480dd07dc32..0000000000000000000000000000000000000000
--- a/docker/rhel/binary/zaqar
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/zaqar
\ No newline at end of file
diff --git a/docker/rhel/osp b/docker/rhel/osp
deleted file mode 120000
index cab89b7b47cc051984e4409bbc4521643d53cd7a..0000000000000000000000000000000000000000
--- a/docker/rhel/osp
+++ /dev/null
@@ -1 +0,0 @@
-binary
\ No newline at end of file
diff --git a/docker/ubuntu/binary/base/Dockerfile b/docker/ubuntu/binary/base/Dockerfile
deleted file mode 100644
index dbe5e97dde7d837ba7c89aad305ae21e7e4d70e3..0000000000000000000000000000000000000000
--- a/docker/ubuntu/binary/base/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM ubuntu:trusty
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends software-properties-common \
-    && add-apt-repository cloud-archive:kilo \
-    && apt-get update \
-    && apt-get upgrade -y \
-    && apt-get dist-upgrade -y \
-    && apt-get install -y --no-install-recommends \
-        crudini \
-        curl \
-        openssl \
-    && apt-get clean
-
-COPY kolla-common.sh /opt/kolla/
diff --git a/docker/ubuntu/binary/base/build b/docker/ubuntu/binary/base/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/ubuntu/binary/base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/ubuntu/binary/base/kolla-common.sh b/docker/ubuntu/binary/base/kolla-common.sh
deleted file mode 120000
index c265c62f7ae70d3fa72661782afc0be3affc49c8..0000000000000000000000000000000000000000
--- a/docker/ubuntu/binary/base/kolla-common.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/base/kolla-common.sh
\ No newline at end of file
diff --git a/docker/ubuntu/binary/keystone/Dockerfile b/docker/ubuntu/binary/keystone/Dockerfile
deleted file mode 100644
index 9ce96618e3cf9f3d03ffd707abff72aa8f9c72fb..0000000000000000000000000000000000000000
--- a/docker/ubuntu/binary/keystone/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN apt-get install -y --no-install-recommends \
-        apache2 \
-        keystone \
-        libapache2-mod-wsgi \
-        python-keystoneclient \
-    && apt-get clean
-
-RUN curl -o /etc/apache2/sites-available/wsgi-keystone.conf \
-    https://raw.githubusercontent.com/openstack/keystone/stable/kilo/httpd/wsgi-keystone.conf
-RUN ln -s /etc/apache2/sites-available/wsgi-keystone.conf /etc/apache2/sites-enabled
-RUN mkdir -p /var/www/cgi-bin/keystone
-RUN cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/main
-RUN cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/admin
-RUN chown -R keystone:keystone /var/www/cgi-bin/keystone
-RUN chmod 755 /var/www/cgi-bin/keystone/*
-
-COPY start.sh /
-
-CMD ["/start.sh"]
diff --git a/docker/ubuntu/binary/keystone/build b/docker/ubuntu/binary/keystone/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/ubuntu/binary/keystone/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/ubuntu/binary/keystone/start.sh b/docker/ubuntu/binary/keystone/start.sh
deleted file mode 120000
index ae34844eaba6ef4cb9a99fa6c751879566f138a7..0000000000000000000000000000000000000000
--- a/docker/ubuntu/binary/keystone/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/keystone/start.sh
\ No newline at end of file
diff --git a/docker/ubuntu/binary/nova-base/Dockerfile b/docker/ubuntu/binary/nova-base/Dockerfile
deleted file mode 100644
index 704b5d2e0b6973395b4fb547f7e30031886cb91b..0000000000000000000000000000000000000000
--- a/docker/ubuntu/binary/nova-base/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN apt-get install -y --no-install-recommends \
-        nova-common \
-        python-cinderclient \
-        python-keystoneclient \
-        python-nova \
-        bridge-utils \
-    && apt-get clean
diff --git a/docker/ubuntu/binary/nova-base/build b/docker/ubuntu/binary/nova-base/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/ubuntu/binary/nova-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/ubuntu/binary/rabbitmq/Dockerfile b/docker/ubuntu/binary/rabbitmq/Dockerfile
deleted file mode 100644
index d9df48932ffa590168aea5b2cec84e96adb69478..0000000000000000000000000000000000000000
--- a/docker/ubuntu/binary/rabbitmq/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN apt-get install -y --no-install-recommends \
-        hostname \
-        rabbitmq-server \
-    && apt-get clean \
-    && /usr/lib/rabbitmq/bin/rabbitmq-plugins --offline enable rabbitmq_management
-
-COPY config-rabbit.sh config-external.sh /opt/kolla/
-COPY start.sh /
-
-CMD ["/start.sh"]
diff --git a/docker/ubuntu/binary/rabbitmq/build b/docker/ubuntu/binary/rabbitmq/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/ubuntu/binary/rabbitmq/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/ubuntu/binary/rabbitmq/config-external.sh b/docker/ubuntu/binary/rabbitmq/config-external.sh
deleted file mode 120000
index e02e664c8e92db17ac6905f6376942579943112e..0000000000000000000000000000000000000000
--- a/docker/ubuntu/binary/rabbitmq/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/rabbitmq/config-external.sh
\ No newline at end of file
diff --git a/docker/ubuntu/binary/rabbitmq/config-rabbit.sh b/docker/ubuntu/binary/rabbitmq/config-rabbit.sh
deleted file mode 120000
index 6feee2aba4d747c529a23058c0ad902cf5a12b65..0000000000000000000000000000000000000000
--- a/docker/ubuntu/binary/rabbitmq/config-rabbit.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/rabbitmq/config-rabbit.sh
\ No newline at end of file
diff --git a/docker/ubuntu/binary/rabbitmq/start.sh b/docker/ubuntu/binary/rabbitmq/start.sh
deleted file mode 120000
index 035f55e267c70eebbd8d0db7b259beb91f85f96b..0000000000000000000000000000000000000000
--- a/docker/ubuntu/binary/rabbitmq/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/rabbitmq/start.sh
\ No newline at end of file
diff --git a/docker/ubuntu/source/base/Dockerfile b/docker/ubuntu/source/base/Dockerfile
deleted file mode 100644
index d85fcb42b141ca8e5a385f4f4157f0006c2d790a..0000000000000000000000000000000000000000
--- a/docker/ubuntu/source/base/Dockerfile
+++ /dev/null
@@ -1,39 +0,0 @@
-FROM ubuntu:trusty
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends software-properties-common \
-    && add-apt-repository cloud-archive:kilo \
-    && apt-get update \
-    && apt-get upgrade -y \
-    && apt-get dist-upgrade -y \
-    && apt-get install -y --no-install-recommends \
-        crudini \
-        curl \
-        gcc \
-        git \
-        ldap-utils \
-        libffi-dev \
-        libxml2-dev \
-        libxslt-dev \
-        mysql-server\
-        openssl \
-        postgresql \
-        python-dev \
-        python-oslo-policy \
-        slapd \
-        sqlite \
-        tar \
-    && apt-get clean
-
-RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
-    && python get-pip.py \
-    && rm get-pip.py
-
-RUN pip install --upgrade \
-    cachetools \
-    crudini \
-    pip \
-    tox
-
-COPY kolla-common.sh /opt/kolla/
diff --git a/docker/ubuntu/source/base/build b/docker/ubuntu/source/base/build
deleted file mode 120000
index 8d652f7ee21d162d383b4c4ce036c4ae1ae2f9fa..0000000000000000000000000000000000000000
--- a/docker/ubuntu/source/base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/ubuntu/source/base/kolla-common.sh b/docker/ubuntu/source/base/kolla-common.sh
deleted file mode 120000
index c265c62f7ae70d3fa72661782afc0be3affc49c8..0000000000000000000000000000000000000000
--- a/docker/ubuntu/source/base/kolla-common.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/base/kolla-common.sh
\ No newline at end of file
diff --git a/tests/test_images.py b/tests/test_images.py
deleted file mode 100644
index d0a70079289a2a8f43133548a67cbb09ceb3f6b4..0000000000000000000000000000000000000000
--- a/tests/test_images.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from oslo_log import fixture as log_fixture
-from oslo_log import log as logging
-from oslotest import base
-
-from subprocess import PIPE
-from subprocess import Popen
-from subprocess import STDOUT
-
-LOG = logging.getLogger(__name__)
-
-
-class ImagesTest(base.BaseTestCase):
-
-    def setUp(self):
-        super(ImagesTest, self).setUp()
-        self.useFixture(log_fixture.SetLogLevel([__name__],
-                                                logging.logging.INFO))
-
-    def test_builds(self):
-        proc = Popen(['tools/build-all-docker-images',
-                      '--testmode',
-                      '--retry 3'],
-                     stdout=PIPE, stderr=STDOUT, bufsize=1)
-        with proc.stdout:
-            for line in iter(proc.stdout.readline, b''):
-                LOG.info(line.strip())
-        proc.wait()
-
-        # these are images that are known to not build properly
-        excluded_images = ["kollaglue/centos-rdo-rhel-osp-base",
-                           "kollaglue/centos-rdo-gnocchi-api",
-                           "kollaglue/centos-rdo-gnocchi-statsd"]
-
-        results = eval(line)
-
-        failures = 0
-        for image, result in results.iteritems():
-            if image in excluded_images:
-                if result is 'fail':
-                    continue
-                failures = failures + 1
-                LOG.warning(">>> Expected image '%s' to fail, please update"
-                            " the excluded_images in source file above if the"
-                            " image build has been fixed." % image)
-            else:
-                if result is not 'fail':
-                    continue
-                failures = failures + 1
-                LOG.critical(">>> Expected image '%s' to succeed!" % image)
-
-        self.assertEqual(failures, 0, "%d failure(s) occurred" % failures)
diff --git a/tools/build-all-docker-images b/tools/build-all-docker-images
deleted file mode 100755
index dfd970426e3a5a6028d1a234d2e759a396c6a913..0000000000000000000000000000000000000000
--- a/tools/build-all-docker-images
+++ /dev/null
@@ -1,239 +0,0 @@
-#!/usr/bin/env bash
-# Depends on bash 4 and gawk
-
-TOPDIR=$(git rev-parse --show-toplevel)
-# Work in a temp dir so that developers can continue working while a build is
-# in progress
-WORKDIR=$(mktemp -d /tmp/kolla-workdir.XXXXXXXXXX)
-# Remove $WORKDIR otherwise $TOPDIR is copied *inside* of it
-rm -rf $WORKDIR
-cp -aL "$TOPDIR" $WORKDIR
-DOCKERDIR="$WORKDIR/docker"
-
-declare -A dependency
-declare -A img_dirs
-declare -A status
-
-function info {
-    [[ -n $1 ]] && printf "%s\n" "$1"
-}
-
-function success {
-    [[ -n $1 ]] && printf "\033[00;32m%s\033[00m\n" "$1"
-}
-
-function warn {
-    [[ -n $1 ]] && printf "\033[00;31m%s\033[00m\n" "$1"
-}
-
-function set_defaults {
-    PREFIX=centos-rdo-
-    NAMESPACE=kollaglue
-    [ -f $WORKDIR/.buildconf ] && . $WORKDIR/.buildconf
-    [ -n "${FORCE_PREFIX}" ] && PREFIX="${FORCE_PREFIX}"
-}
-
-function has_changed {
-    local image=$1
-    # Rebuild everything unless given git revision
-    # We don't really care about the order of the $FROM and $TO parameters, all
-    # we need is the list of changed files between the revisions, or HEAD if
-    # only one of them is specified
-    [[ -z $FROM && -z $TO ]] || git diff --name-only $FROM $TO | grep -q "${img_dirs[$image]#$WORKDIR/}"
-}
-
-function requires_build {
-    local image=$1
-    local dep=${dependency[$image]}
-    # An image requires a built if it meets the following conditions:
-    # - it has instructions to build the image
-    # - it hasn't been processed yet
-    # - its dependency was rebuilt or its build instruction was modified
-    [[ ${img_dirs[$image]} && -z ${status[$image]} ]] && \
-        ([[ ${status[$dep]} == "rebuilt" ]] || has_changed $image)
-}
-
-function build_image {
-    local dir=$1
-    printf "\n"
-    if [ -x "$dir/build" ]; then
-        info "Building image in $dir"
-        if $dir/build $ARGS --no-use-released-parent; then
-            success "Successfully built image in $dir"
-            status[$image]="rebuilt"
-        else
-            warn "Failed to build image in $dir"
-            status[$image]="fail"
-        fi
-    else
-        warn "Image $image does not provide build script"
-        status[$image]="fail"
-    fi
-}
-
-function init_image {
-    local img_dir=$1
-
-    set_defaults
-    [ -f $WORKDIR/.buildconf ] && . $WORKDIR/.buildconf
-    [ -f $img_dir/.buildconf ] && . $img_dir/.buildconf
-    [ -n "$FORCE_NAMESPACE" ]  && NAMESPACE=$FORCE_NAMESPACE
-    [ -n "${REGISTRY}" ]  && NAMESPACE="${REGISTRY}/${NAMESPACE}"
-
-    local image="${NAMESPACE:+${NAMESPACE}/}${PREFIX}${img_dir##*/}"
-    local base_image=$(cat $img_dir/Dockerfile | gawk 'match($0, /^\s*FROM\s+(\S+)/, matches) {print matches[1]}' )
-    base_image=${base_image//%%KOLLA_NAMESPACE%%/$NAMESPACE}
-    base_image=${base_image//%%KOLLA_PREFIX%%/$PREFIX}
-    base_image=${base_image//:%%KOLLA_TAG%%/}
-
-    img_dirs[$image]=$img_dir
-    dependency[$image]=$base_image
-
-    # Restore defaults to minimize risk of side effects
-    set_defaults
-}
-
-function process_image {
-    local image=$1
-    if [ -n "${dependency[$image]}" ]; then
-        process_image ${dependency[$image]}
-    fi
-    if requires_build $image; then
-        build_image ${img_dirs[$image]}
-    fi
-    if [ -z "${status[$image]}" ]; then
-        status[$image]="up-to-date"
-    fi
-}
-
-function print_summary {
-    printf "\nSummary\n=======\n"
-    for image in "${!status[@]}"; do
-        case "${status[$image]}" in
-            ("fail")    warn    "Failed to process $image" ;;
-            ("rebuilt") success "Rebuilt $image" ;;
-            (*)         info    "$image: ${status[$image]}" ;;
-        esac
-    done
-}
-
-function print_parseable_summary {
-    printf "{"
-    for image in "${!status[@]}"; do
-        printf "'$image':'${status[$image]}',"
-    done
-    printf "}"
-}
-
-function interrupted {
-    info "Interrupted..."
-    print_summary
-    rm -rf $WORKDIR
-    exit 1
-}
-
-function usage {
-    read -r -d '' HELP <<EOF
-A wrapper to build-docker-image that build all images in order.
-
-Options:
-
---prefix <image_prefix>
---from <git-revision>
---to <git-revision>
-
-$($WORKDIR/tools/build-docker-image --help)
-EOF
-    printf "%s\n" "${HELP/$WORKDIR\/tools\/build-docker-image/$0}"
-}
-
-trap 'interrupted' INT
-
-
-ARGS=$@
-PARSED_ARGS=$(getopt -q -o hr:n:t: -l help,prefix:,namespace:,release,tag:,private-registry:,from:,to:,testmode -- "$@")
-
-eval set -- "$PARSED_ARGS"
-
-while :; do
-    case "$1" in
-
-    (--help|-h) usage
-                exit 0
-                ;;
-
-    (--prefix)  shift
-                FORCE_PREFIX="$1"
-                ;;
-
-    (--namespace|-n)
-                shift
-                FORCE_NAMESPACE="$1"
-                ;;
-
-    (--release)
-                RELEASE_SPECIFIED=1
-                ;;
-
-    (--tag|-t)
-                shift
-                TAG_SPECIFIED=1
-                ;;
-
-    (--private-registry|-r)
-                shift
-                REGISTRY="$1"
-                ;;
-
-    (--from)
-                shift
-                FROM="$1"
-                ARGS=${ARGS/\-\-from*$FROM/}
-                ;;
-
-    (--to)
-                shift
-                TO="$1"
-                ARGS=${ARGS/\-\-to*$TO/}
-                ;;
-
-    (--testmode)
-                TESTMODE=1
-                ARGS=${ARGS/\-\-testmode/}
-                ;;
-
-    (--)        break
-                ;;
-
-    esac
-
-    shift
-done
-
-set_defaults
-
-# BASE == centos, fedora, ubuntu, etc.
-BASE=$(echo "${PREFIX}" | cut -d- -f1)
-# TYPE == binary, source, rdo
-TYPE=$(echo "${PREFIX}" | cut -d- -f2)
-
-# Ensure a tag is specified otherwise build may fail when changing git branch
-# The release tag is automatically appended when --release flag is used.
-if [[ $RELEASE_SPECIFIED != 1 ]] && [[ $TAG_SPECIFIED != 1 ]]; then
-    TAG=$(git rev-parse --short HEAD)
-    ARGS+=" --tag $TAG"
-fi
-
-# Do a first pass to find images to build and their dependencies
-for dockerfile in $(find "${DOCKERDIR}/${BASE}/${TYPE}" -name Dockerfile); do
-    init_image $(dirname $dockerfile)
-done
-
-# Process all images
-for image in "${!img_dirs[@]}"; do
-    process_image $image
-done
-
-print_summary
-[ -n "$TESTMODE" ] && print_parseable_summary
-rm -rf $WORKDIR
diff --git a/tools/build-docker-image b/tools/build-docker-image
deleted file mode 100755
index f7c7995e1182a1de994668bdf0c90e92e64d52ab..0000000000000000000000000000000000000000
--- a/tools/build-docker-image
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/bin/bash
-
-TOPDIR=$(git rev-parse --show-toplevel)
-IMGDIR="$(cd "$(dirname "$0")" && pwd)"
-
-. $TOPDIR/tools/validate-docker-execute
-
-RELEASE_NAMESPACE=kollaglue
-NAMESPACE=kollaglue
-PREFIX=centos-rdo-
-TAG=$(git rev-parse --short HEAD)
-RELEASE_TAG=latest
-MAX_TRIES=1
-
-usage () {
-    cat <<EOF
-Usage: $0 [options]
-
-Options:
-
---prefix <image_prefix>
---private-registry, -r <registry_address[:port]>
---namespace, -n <namespace>
---tag, -t <tag>
---push, -p
---force-rm, -f
---no-cache, -N
---pull, -u
---release
---no-use-released-parent
---retry <number_of_retries>
-EOF
-}
-
-[ -f $TOPDIR/.buildconf ] && . $TOPDIR/.buildconf
-[ -f $IMGDIR/.buildinfo ] && . $IMGDIR/.buildinfo
-[ -f $IMGDIR/.buildconf ] && . $IMGDIR/.buildconf
-
-ARGS=$(getopt -o hr:n:t:pfuN -l help,prefix:,namespace:,push,pull,private-registry:,release,tag:,force-rm,no-cache,no-use-released-parent,retry: -- "$@") || { usage >&2; exit 2; }
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-
-    (--help|-h) usage
-                exit 0
-                ;;
-
-    (--prefix)  shift
-                FORCE_PREFIX="$1"
-                ;;
-
-    (--release) MODE=release
-                NAMESPACE=$RELEASE_NAMESPACE
-                TAG=$RELEASE_TAG
-                ;;
-
-    (--tag|-t)  shift
-                TAG="$1"
-                ;;
-
-    (--push|-p) PUSH=1
-                ;;
-
-    (--pull|-u) BUILDFLAGS="${BUILDFLAGS} --pull=true"
-                ;;
-
-    (--force-rm|-f)
-                BUILDFLAGS="${BUILDFLAGS} --force-rm=true"
-                ;;
-
-    (--no-cache|-N)
-                BUILDFLAGS="${BUILDFLAGS} --no-cache"
-                ;;
-
-    (--private-registry|-r)
-                shift
-                REGISTRY="$1"
-                ;;
-
-    (--namespace|-n)
-                shift
-                NAMESPACE="$1"
-                ;;
-
-    (--no-use-released-parent)
-                USE_CURRENT_TAG=1
-                ;;
-
-    (--retry)
-                shift
-                MAX_TRIES=$((MAX_TRIES + $1))
-                ;;
-
-    (--)        break
-                ;;
-
-    esac
-
-    shift
-done
-
-if [[ $USE_CURRENT_TAG = 1 ]]; then
-    PARENT_TAG=$TAG
-else
-    PARENT_TAG=$RELEASE_TAG
-fi
-
-if [ "$NAMESPACE" = "$RELEASE_NAMESPACE" ] \
-    && [ "$TAG" = "$RELEASE_TAG" ] \
-    && ! [ "$MODE" = "release" ]; then
-
-    echo "ERROR: use --release to build a release image" >&2
-    exit 1
-fi
-
-if [[ -n "${PREFIX}" && -n "${FORCE_PREFIX}" ]]; then
-    PREFIX="${FORCE_PREFIX}"
-fi
-
-
-if [[ -n $REGISTRY ]]; then
-    NAMESPACE="${REGISTRY}/${NAMESPACE}"
-fi
-
-IMAGE="${PREFIX}${IMGDIR##*/}"
-FULLIMAGE="${NAMESPACE}/${IMAGE}${TAG:+:${TAG}}"
-
-cat <<EOF
-======================================================================
-$FULLIMAGE
-======================================================================
-
-EOF
-
-if [ "$MODE" = "release" ]; then
-    echo "*** YOU ARE BUILDING A RELEASE IMAGE ***"
-    echo
-fi
-
-TMPDIR=$(mktemp -d /tmp/kolla-build.XXXXXXXXXX)
-cp -aL $IMGDIR/* $TMPDIR
-# Use an extension for in-place editing for portability, as GNU and BSD
-# versions of sed behave differently otherwise
-sed -i.bak "s|%%KOLLA_NAMESPACE%%|${NAMESPACE}|g" $TMPDIR/Dockerfile
-sed -i.bak "s|%%KOLLA_PREFIX%%|${PREFIX}|g" $TMPDIR/Dockerfile
-sed -i.bak "s|%%KOLLA_TAG%%|${PARENT_TAG}|g" $TMPDIR/Dockerfile
-
-if [[ "${SOURCE_INSTALL_AVAILABLE}" == "1" ]]; then
-    . ${TOPDIR}/tools/gen-source-tar.sh
-fi
-
-TRY=0
-while [ $((MAX_TRIES - 1)) -gt $TRY ]; do
-    if docker build ${BUILDFLAGS} -t "$FULLIMAGE" $TMPDIR; then
-        break
-    else
-        echo "WARNING: failed to build $FULLIMAGE, retrying..."
-        TRY=$((TRY + 1))
-    fi
-done
-
-if ! docker build ${BUILDFLAGS} -t "$FULLIMAGE" $TMPDIR; then
-    echo "ERROR: failed to build $FULLIMAGE"
-    exit 1
-fi
-
-rm -rf $TMPDIR
-
-echo "Built: $FULLIMAGE"
-
-if [ "$PUSH" = 1 ]; then
-    if ! docker push "$FULLIMAGE"; then
-        echo "ERROR: failed to push $FULLIMAGE"
-        exit 1
-    fi
-
-    echo "Pushed: $FULLIMAGE"
-fi
diff --git a/tools/gen-source-tar.sh b/tools/gen-source-tar.sh
deleted file mode 100644
index 6f3a6eb205795fbee9627eab8401cc08f9c6e40e..0000000000000000000000000000000000000000
--- a/tools/gen-source-tar.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-set -e
-
-: ${SOURCE_INSTALL_METHOD:=curl}
-: ${GIT_REF:=master}
-: ${LOCAL_SOURCE:=/tmp/${COMPONENT}}
-
-function fetch_source_from_uri {
-    curl ${TARBALL_URI} -o ${TMPDIR}/${COMPONENT}.tar
-}
-
-function fetch_source_from_git {
-    # NOTE(pbourke): do a shallow clone to master only, unless a specific ref is
-    # required
-    if [ -z ${GIT_REF} ]; then
-        git clone --depth=1 ${CLONE_FROM} ${TMPDIR}/${COMPONENT}
-    else
-        git clone ${CLONE_FROM} ${TMPDIR}/${COMPONENT}
-        git --git-dir ${TMPDIR}/${COMPONENT}/.git \
-            --work-tree ${TMPDIR}/${COMPONENT}/ \
-            checkout ${GIT_REF}
-    fi
-    tar -cf ${TMPDIR}/${COMPONENT}.tar -C ${TMPDIR} ${COMPONENT}
-}
-
-function fetch_source_from_local {
-    tar -cf ${TMPDIR}/${COMPONENT}.tar \
-        -C $(dirname ${LOCAL_SOURCE}) ${COMPONENT}
-}
-
-case ${SOURCE_INSTALL_METHOD} in
-    curl)
-        fetch_source_from_uri
-        ;;
-    git)
-        fetch_source_from_git
-        ;;
-    local)
-        fetch_source_from_local
-        ;;
-    *)
-        cat << EOF
-Unknown install method '${SOURCE_INSTALL_METHOD}'. Please check the value of
-\$SOURCE_INSTALL_METHOD in .buildconf
-EOF
-        exit 1
-        ;;
-esac
diff --git a/tools/update-build-links b/tools/update-build-links
deleted file mode 100755
index 76c4df3efdac67cc3f4c9bc6c39b8b1d51a7e716..0000000000000000000000000000000000000000
--- a/tools/update-build-links
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')")
-cd "$(dirname "$REAL_PATH")/.."
-
-find docker -name Dockerfile | while read dockerfile; do
-    dir=${dockerfile%/*}
-    link=$(python -c 'import os,sys; print os.path.relpath(sys.argv[1], sys.argv[2])' \
-        $PWD/tools/build-docker-image $dir)
-    ln -sf $link $dir/build
-done
-
diff --git a/tools/validate-links.sh b/tools/validate-links.sh
deleted file mode 100755
index 671120dd503934aa1c061ea4ace701c8408aae18..0000000000000000000000000000000000000000
--- a/tools/validate-links.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')")
-cd "$(dirname "$REAL_PATH")/.."
-
-if find . -type l -exec test ! -e {} \; -print | egrep '.*'; then
-    exit 1
-fi
diff --git a/tox.ini b/tox.ini
index 284fa0bc74fd8c8bd0f9b2b57b108e30838d3eeb..c4046de7a7b6e8e6d3115de219bbdf312c8a26ee 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,18 +29,6 @@ commands =
 whitelist_externals = bash
 commands = bash -c tests/setup_gate.sh
 
-[testenv:images]
-whitelist_externals = find
-                      bash
-                      sudo
-commands =
-   bash -c "if [ -f .buildconf ]; then mv .buildconf buildconf.bak; fi"
-   bash -c "echo PREFIX=centos-rdo- > .buildconf"
-   find . -type f -name "*.pyc" -delete
-   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-   sudo -g docker testr run ^(test_images).*
-   bash -c "if [ -f buildconf.bak ]; then mv buildconf.bak .buildconf; fi"
-
 # deprecated
 [testenv:images-centos-binary]
 whitelist_externals = find