aboutsummaryrefslogtreecommitdiff
path: root/docker/centos/source
diff options
context:
space:
mode:
Diffstat (limited to 'docker/centos/source')
-rw-r--r--docker/centos/source/base/Dockerfile38
l---------docker/centos/source/base/build1
l---------docker/centos/source/base/kolla-common.sh1
-rw-r--r--docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile7
l---------docker/centos/source/ceilometer/ceilometer-alarm/build1
l---------docker/centos/source/ceilometer/ceilometer-alarm/config-external.sh1
l---------docker/centos/source/ceilometer/ceilometer-alarm/start.sh1
-rw-r--r--docker/centos/source/ceilometer/ceilometer-api/Dockerfile6
l---------docker/centos/source/ceilometer/ceilometer-api/build1
l---------docker/centos/source/ceilometer/ceilometer-api/config-external.sh1
l---------docker/centos/source/ceilometer/ceilometer-api/start.sh1
-rw-r--r--docker/centos/source/ceilometer/ceilometer-base/.buildinfo10
-rw-r--r--docker/centos/source/ceilometer/ceilometer-base/Dockerfile15
l---------docker/centos/source/ceilometer/ceilometer-base/build1
-rw-r--r--docker/centos/source/ceilometer/ceilometer-central/Dockerfile7
l---------docker/centos/source/ceilometer/ceilometer-central/build1
l---------docker/centos/source/ceilometer/ceilometer-central/config-external.sh1
l---------docker/centos/source/ceilometer/ceilometer-central/start.sh1
-rw-r--r--docker/centos/source/ceilometer/ceilometer-collector/Dockerfile7
l---------docker/centos/source/ceilometer/ceilometer-collector/build1
l---------docker/centos/source/ceilometer/ceilometer-collector/config-external.sh1
l---------docker/centos/source/ceilometer/ceilometer-collector/start.sh1
-rw-r--r--docker/centos/source/ceilometer/ceilometer-compute/Dockerfile7
l---------docker/centos/source/ceilometer/ceilometer-compute/build1
l---------docker/centos/source/ceilometer/ceilometer-compute/config-external.sh1
l---------docker/centos/source/ceilometer/ceilometer-compute/start.sh1
-rw-r--r--docker/centos/source/ceilometer/ceilometer-notification/Dockerfile7
l---------docker/centos/source/ceilometer/ceilometer-notification/build1
l---------docker/centos/source/ceilometer/ceilometer-notification/config-external.sh1
l---------docker/centos/source/ceilometer/ceilometer-notification/start.sh1
-rw-r--r--docker/centos/source/cinder/cinder-api/Dockerfile9
l---------docker/centos/source/cinder/cinder-api/build1
l---------docker/centos/source/cinder/cinder-api/config-external.sh1
l---------docker/centos/source/cinder/cinder-api/start.sh1
-rw-r--r--docker/centos/source/cinder/cinder-backup/Dockerfile7
l---------docker/centos/source/cinder/cinder-backup/build1
l---------docker/centos/source/cinder/cinder-backup/config-external.sh1
l---------docker/centos/source/cinder/cinder-backup/start.sh1
-rw-r--r--docker/centos/source/cinder/cinder-base/.buildinfo10
-rw-r--r--docker/centos/source/cinder/cinder-base/Dockerfile21
l---------docker/centos/source/cinder/cinder-base/build1
-rw-r--r--docker/centos/source/cinder/cinder-scheduler/Dockerfile7
l---------docker/centos/source/cinder/cinder-scheduler/build1
l---------docker/centos/source/cinder/cinder-scheduler/config-external.sh1
l---------docker/centos/source/cinder/cinder-scheduler/start.sh1
-rw-r--r--docker/centos/source/cinder/cinder-volume/Dockerfile14
l---------docker/centos/source/cinder/cinder-volume/build1
l---------docker/centos/source/cinder/cinder-volume/config-external.sh1
l---------docker/centos/source/cinder/cinder-volume/start.sh1
-rw-r--r--docker/centos/source/data/Dockerfile4
l---------docker/centos/source/data/build1
-rw-r--r--docker/centos/source/designate/designate-api/Dockerfile7
l---------docker/centos/source/designate/designate-api/build1
l---------docker/centos/source/designate/designate-api/config-external.sh1
l---------docker/centos/source/designate/designate-api/start.sh1
-rw-r--r--docker/centos/source/designate/designate-backend-bind9/Dockerfile7
l---------docker/centos/source/designate/designate-backend-bind9/build1
l---------docker/centos/source/designate/designate-backend-bind9/config-external.sh1
l---------docker/centos/source/designate/designate-backend-bind9/start.sh1
-rw-r--r--docker/centos/source/designate/designate-base/.buildinfo11
-rw-r--r--docker/centos/source/designate/designate-base/Dockerfile15
l---------docker/centos/source/designate/designate-base/build1
-rw-r--r--docker/centos/source/designate/designate-central/Dockerfile7
l---------docker/centos/source/designate/designate-central/build1
l---------docker/centos/source/designate/designate-central/config-external.sh1
l---------docker/centos/source/designate/designate-central/start.sh1
-rw-r--r--docker/centos/source/designate/designate-mdns/Dockerfile7
l---------docker/centos/source/designate/designate-mdns/build1
l---------docker/centos/source/designate/designate-mdns/config-external.sh1
l---------docker/centos/source/designate/designate-mdns/start.sh1
-rw-r--r--docker/centos/source/designate/designate-poolmanager/Dockerfile7
l---------docker/centos/source/designate/designate-poolmanager/build1
l---------docker/centos/source/designate/designate-poolmanager/config-external.sh1
l---------docker/centos/source/designate/designate-poolmanager/start.sh1
-rw-r--r--docker/centos/source/designate/designate-sink/Dockerfile7
l---------docker/centos/source/designate/designate-sink/build1
l---------docker/centos/source/designate/designate-sink/config-external.sh1
l---------docker/centos/source/designate/designate-sink/start.sh1
-rw-r--r--docker/centos/source/glance/glance-api/Dockerfile7
l---------docker/centos/source/glance/glance-api/build1
l---------docker/centos/source/glance/glance-api/config-external.sh1
l---------docker/centos/source/glance/glance-api/start.sh1
-rw-r--r--docker/centos/source/glance/glance-base/.buildinfo9
-rw-r--r--docker/centos/source/glance/glance-base/Dockerfile16
l---------docker/centos/source/glance/glance-base/build1
-rw-r--r--docker/centos/source/glance/glance-registry/Dockerfile7
l---------docker/centos/source/glance/glance-registry/build1
l---------docker/centos/source/glance/glance-registry/config-external.sh1
l---------docker/centos/source/glance/glance-registry/start.sh1
-rw-r--r--docker/centos/source/gnocchi/gnocchi-api/Dockerfile7
l---------docker/centos/source/gnocchi/gnocchi-api/build1
l---------docker/centos/source/gnocchi/gnocchi-api/config-external.sh1
l---------docker/centos/source/gnocchi/gnocchi-api/start.sh1
-rw-r--r--docker/centos/source/gnocchi/gnocchi-base/.buildinfo10
-rw-r--r--docker/centos/source/gnocchi/gnocchi-base/Dockerfile13
l---------docker/centos/source/gnocchi/gnocchi-base/build1
-rw-r--r--docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile7
l---------docker/centos/source/gnocchi/gnocchi-statsd/build1
l---------docker/centos/source/gnocchi/gnocchi-statsd/config-external.sh1
l---------docker/centos/source/gnocchi/gnocchi-statsd/start.sh1
-rw-r--r--docker/centos/source/heat/heat-api-cfn/Dockerfile7
l---------docker/centos/source/heat/heat-api-cfn/build1
l---------docker/centos/source/heat/heat-api-cfn/config-external.sh1
l---------docker/centos/source/heat/heat-api-cfn/start.sh1
-rw-r--r--docker/centos/source/heat/heat-api/Dockerfile7
l---------docker/centos/source/heat/heat-api/build1
l---------docker/centos/source/heat/heat-api/config-external.sh1
l---------docker/centos/source/heat/heat-api/start.sh1
-rw-r--r--docker/centos/source/heat/heat-base/.buildinfo10
-rw-r--r--docker/centos/source/heat/heat-base/Dockerfile13
l---------docker/centos/source/heat/heat-base/build1
-rw-r--r--docker/centos/source/heat/heat-engine/Dockerfile7
l---------docker/centos/source/heat/heat-engine/build1
l---------docker/centos/source/heat/heat-engine/config-external.sh1
l---------docker/centos/source/heat/heat-engine/start.sh1
-rw-r--r--docker/centos/source/horizon/.buildinfo10
-rw-r--r--docker/centos/source/horizon/Dockerfile36
l---------docker/centos/source/horizon/build1
l---------docker/centos/source/horizon/config-external.sh1
l---------docker/centos/source/horizon/start.sh1
-rw-r--r--docker/centos/source/keystone/.buildinfo10
-rw-r--r--docker/centos/source/keystone/Dockerfile30
l---------docker/centos/source/keystone/build1
l---------docker/centos/source/keystone/config-external.sh1
l---------docker/centos/source/keystone/start.sh1
-rw-r--r--docker/centos/source/magnum/magnum-api/Dockerfile7
l---------docker/centos/source/magnum/magnum-api/build1
l---------docker/centos/source/magnum/magnum-api/config-external.sh1
l---------docker/centos/source/magnum/magnum-api/start.sh1
-rw-r--r--docker/centos/source/magnum/magnum-base/.buildinfo10
-rw-r--r--docker/centos/source/magnum/magnum-base/Dockerfile13
l---------docker/centos/source/magnum/magnum-base/build1
-rw-r--r--docker/centos/source/magnum/magnum-conductor/Dockerfile10
l---------docker/centos/source/magnum/magnum-conductor/build1
l---------docker/centos/source/magnum/magnum-conductor/config-external.sh1
l---------docker/centos/source/magnum/magnum-conductor/start.sh1
-rw-r--r--docker/centos/source/murano/murano-api/Dockerfile8
l---------docker/centos/source/murano/murano-api/build1
l---------docker/centos/source/murano/murano-api/config-external.sh1
l---------docker/centos/source/murano/murano-api/start.sh1
-rw-r--r--docker/centos/source/murano/murano-base/.buildinfo10
-rw-r--r--docker/centos/source/murano/murano-base/Dockerfile15
l---------docker/centos/source/murano/murano-base/build1
-rw-r--r--docker/centos/source/murano/murano-engine/Dockerfile8
l---------docker/centos/source/murano/murano-engine/build1
l---------docker/centos/source/murano/murano-engine/config-external.sh1
l---------docker/centos/source/murano/murano-engine/start.sh1
-rw-r--r--docker/centos/source/neutron/neutron-agents/Dockerfile27
l---------docker/centos/source/neutron/neutron-agents/build1
l---------docker/centos/source/neutron/neutron-agents/fwaas_driver.ini1
l---------docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh1
l---------docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/start.sh1
l---------docker/centos/source/neutron/neutron-agents/neutron-l3-agent/config-external.sh1
l---------docker/centos/source/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini1
l---------docker/centos/source/neutron/neutron-agents/neutron-l3-agent/start.sh1
l---------docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/config-external.sh1
l---------docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/start.sh1
l---------docker/centos/source/neutron/neutron-agents/supervisord.conf1
-rw-r--r--docker/centos/source/neutron/neutron-base/.buildinfo10
-rw-r--r--docker/centos/source/neutron/neutron-base/Dockerfile19
l---------docker/centos/source/neutron/neutron-base/build1
l---------docker/centos/source/neutron/neutron-base/config-sudoers.sh1
-rw-r--r--docker/centos/source/neutron/neutron-linuxbridge-agent/Dockerfile10
l---------docker/centos/source/neutron/neutron-linuxbridge-agent/build1
l---------docker/centos/source/neutron/neutron-linuxbridge-agent/config-external.sh1
l---------docker/centos/source/neutron/neutron-linuxbridge-agent/start.sh1
-rw-r--r--docker/centos/source/neutron/neutron-openvswitch-agent/Dockerfile13
l---------docker/centos/source/neutron/neutron-openvswitch-agent/build1
l---------docker/centos/source/neutron/neutron-openvswitch-agent/config-external.sh1
l---------docker/centos/source/neutron/neutron-openvswitch-agent/start.sh1
-rw-r--r--docker/centos/source/neutron/neutron-server/Dockerfile11
l---------docker/centos/source/neutron/neutron-server/build1
l---------docker/centos/source/neutron/neutron-server/config-external.sh1
l---------docker/centos/source/neutron/neutron-server/start.sh1
-rw-r--r--docker/centos/source/nova/nova-api/Dockerfile7
l---------docker/centos/source/nova/nova-api/build1
l---------docker/centos/source/nova/nova-api/config-external.sh1
l---------docker/centos/source/nova/nova-api/start.sh1
-rw-r--r--docker/centos/source/nova/nova-base/.buildinfo13
-rw-r--r--docker/centos/source/nova/nova-base/Dockerfile24
l---------docker/centos/source/nova/nova-base/build1
-rw-r--r--docker/centos/source/nova/nova-compute/Dockerfile13
l---------docker/centos/source/nova/nova-compute/build1
l---------docker/centos/source/nova/nova-compute/config-external.sh1
l---------docker/centos/source/nova/nova-compute/start.sh1
-rw-r--r--docker/centos/source/nova/nova-conductor/Dockerfile8
l---------docker/centos/source/nova/nova-conductor/build1
l---------docker/centos/source/nova/nova-conductor/config-external.sh1
l---------docker/centos/source/nova/nova-conductor/start.sh1
-rw-r--r--docker/centos/source/nova/nova-consoleauth/Dockerfile8
l---------docker/centos/source/nova/nova-consoleauth/build1
l---------docker/centos/source/nova/nova-consoleauth/config-external.sh1
l---------docker/centos/source/nova/nova-consoleauth/start.sh1
-rw-r--r--docker/centos/source/nova/nova-libvirt/Dockerfile18
l---------docker/centos/source/nova/nova-libvirt/build1
l---------docker/centos/source/nova/nova-libvirt/config-external.sh1
l---------docker/centos/source/nova/nova-libvirt/start.sh1
-rw-r--r--docker/centos/source/nova/nova-network/Dockerfile9
l---------docker/centos/source/nova/nova-network/build1
l---------docker/centos/source/nova/nova-network/config-external.sh1
l---------docker/centos/source/nova/nova-network/start.sh1
-rw-r--r--docker/centos/source/nova/nova-novncproxy/Dockerfile13
l---------docker/centos/source/nova/nova-novncproxy/build1
l---------docker/centos/source/nova/nova-novncproxy/config-external.sh1
l---------docker/centos/source/nova/nova-novncproxy/start.sh1
-rw-r--r--docker/centos/source/nova/nova-scheduler/Dockerfile8
l---------docker/centos/source/nova/nova-scheduler/build1
l---------docker/centos/source/nova/nova-scheduler/config-external.sh1
l---------docker/centos/source/nova/nova-scheduler/start.sh1
-rw-r--r--docker/centos/source/swift/swift-account-server/Dockerfile7
l---------docker/centos/source/swift/swift-account-server/build1
l---------docker/centos/source/swift/swift-account-server/config-external.sh1
l---------docker/centos/source/swift/swift-account-server/start.sh1
-rw-r--r--docker/centos/source/swift/swift-base/.buildinfo10
-rw-r--r--docker/centos/source/swift/swift-base/Dockerfile19
l---------docker/centos/source/swift/swift-base/build1
l---------docker/centos/source/swift/swift-base/config-swift.sh1
-rw-r--r--docker/centos/source/swift/swift-container-server/Dockerfile7
l---------docker/centos/source/swift/swift-container-server/build1
l---------docker/centos/source/swift/swift-container-server/config-external.sh1
l---------docker/centos/source/swift/swift-container-server/start.sh1
-rw-r--r--docker/centos/source/swift/swift-object-auditor/Dockerfile7
l---------docker/centos/source/swift/swift-object-auditor/build1
l---------docker/centos/source/swift/swift-object-auditor/config-external.sh1
l---------docker/centos/source/swift/swift-object-auditor/start.sh1
-rw-r--r--docker/centos/source/swift/swift-object-base/Dockerfile4
l---------docker/centos/source/swift/swift-object-base/build1
l---------docker/centos/source/swift/swift-object-base/config-swift-object.sh1
-rw-r--r--docker/centos/source/swift/swift-object-expirer/Dockerfile7
l---------docker/centos/source/swift/swift-object-expirer/build1
l---------docker/centos/source/swift/swift-object-expirer/config-external.sh1
l---------docker/centos/source/swift/swift-object-expirer/start.sh1
-rw-r--r--docker/centos/source/swift/swift-object-replicator/Dockerfile7
l---------docker/centos/source/swift/swift-object-replicator/build1
l---------docker/centos/source/swift/swift-object-replicator/config-external.sh1
l---------docker/centos/source/swift/swift-object-replicator/start.sh1
-rw-r--r--docker/centos/source/swift/swift-object-server/Dockerfile7
l---------docker/centos/source/swift/swift-object-server/build1
l---------docker/centos/source/swift/swift-object-server/config-external.sh1
l---------docker/centos/source/swift/swift-object-server/start.sh1
-rw-r--r--docker/centos/source/swift/swift-object-updater/Dockerfile7
l---------docker/centos/source/swift/swift-object-updater/build1
l---------docker/centos/source/swift/swift-object-updater/config-external.sh1
l---------docker/centos/source/swift/swift-object-updater/start.sh1
-rw-r--r--docker/centos/source/swift/swift-proxy-server/Dockerfile8
l---------docker/centos/source/swift/swift-proxy-server/build1
l---------docker/centos/source/swift/swift-proxy-server/config-external.sh1
l---------docker/centos/source/swift/swift-proxy-server/start.sh1
-rw-r--r--docker/centos/source/zaqar/.buildinfo10
-rw-r--r--docker/centos/source/zaqar/Dockerfile20
l---------docker/centos/source/zaqar/build1
l---------docker/centos/source/zaqar/config-external.sh1
l---------docker/centos/source/zaqar/start.sh1
253 files changed, 0 insertions, 1037 deletions
diff --git a/docker/centos/source/base/Dockerfile b/docker/centos/source/base/Dockerfile
deleted file mode 100644
index 43e8d1a76..000000000
--- 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 8d652f7ee..000000000
--- 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 c265c62f7..000000000
--- 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 86cf40d92..000000000
--- 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 ec1913803..000000000
--- 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 0a48ebf52..000000000
--- 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 ed3ac528d..000000000
--- 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 5db74a001..000000000
--- 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 ec1913803..000000000
--- 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 4ea59dad7..000000000
--- 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 7acfa2cba..000000000
--- 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 70bd3d7d3..000000000
--- 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 0b4e0e63d..000000000
--- 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 ec1913803..000000000
--- 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 86cf40d92..000000000
--- 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 ec1913803..000000000
--- 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 cfc69e75d..000000000
--- 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 8df383cd1..000000000
--- 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 86cf40d92..000000000
--- 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 ec1913803..000000000
--- 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 e16dcecc1..000000000
--- 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 bea2eb09c..000000000
--- 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 86cf40d92..000000000
--- 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 ec1913803..000000000
--- 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 1d0c728e5..000000000
--- 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 1118b9552..000000000
--- 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 86cf40d92..000000000
--- 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 ec1913803..000000000
--- 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 12d98d9ee..000000000
--- 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 8e6d4e337..000000000
--- 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 99200d910..000000000
--- 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 ec1913803..000000000
--- 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 0e9409e98..000000000
--- 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 4b6c5f104..000000000
--- 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 70b8d8202..000000000
--- 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 ec1913803..000000000
--- 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 4c6f65d40..000000000
--- 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 62ae41b03..000000000
--- 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 05cb8abab..000000000
--- 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 209895b17..000000000
--- 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 ec1913803..000000000
--- 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 70b8d8202..000000000
--- 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 ec1913803..000000000
--- 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 f6d26aba5..000000000
--- 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 0953c6457..000000000
--- 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 c7d6c9446..000000000
--- 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 ec1913803..000000000
--- 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 abcdd6bc4..000000000
--- 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 471a5ebd7..000000000
--- 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 635918540..000000000
--- 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 8d652f7ee..000000000
--- 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 eac73ff52..000000000
--- 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 ec1913803..000000000
--- 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 da641a600..000000000
--- 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 f96fe1a34..000000000
--- 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 eac73ff52..000000000
--- 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 ec1913803..000000000
--- 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 98eabc775..000000000
--- 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 918411fa1..000000000
--- 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 de3736376..000000000
--- 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 f8210a432..000000000
--- 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 ec1913803..000000000
--- 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 eac73ff52..000000000
--- 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 ec1913803..000000000
--- 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 abe5bcd39..000000000
--- 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 9e0a8c484..000000000
--- 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 eac73ff52..000000000
--- 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 ec1913803..000000000
--- 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 e450238fc..000000000
--- 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 f7bf747fc..000000000
--- 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 eac73ff52..000000000
--- 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 ec1913803..000000000
--- 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 461acb12a..000000000
--- 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 cc428b4fe..000000000
--- 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 eac73ff52..000000000
--- 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 ec1913803..000000000
--- 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 edc94e6e4..000000000
--- 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 751b58345..000000000
--- 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 c3c0fd9d1..000000000
--- 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 ec1913803..000000000
--- 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 46a22b7b3..000000000
--- 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 6740e1fe9..000000000
--- 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 19c048a7e..000000000
--- 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 b2a41c49a..000000000
--- 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 ec1913803..000000000
--- 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 22e3fcb10..000000000
--- 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 ec1913803..000000000
--- 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 cfcbd1391..000000000
--- 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 1295cdc31..000000000
--- 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 ad16c6e00..000000000
--- 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 ec1913803..000000000
--- 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 471d03664..000000000
--- 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 99320c6d0..000000000
--- 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 a89f3419d..000000000
--- 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 78bd361d8..000000000
--- 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 ec1913803..000000000
--- 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 ad16c6e00..000000000
--- 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 ec1913803..000000000
--- 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 fe516e42c..000000000
--- 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 ad961553e..000000000
--- 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 fb0d48115..000000000
--- 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 ec1913803..000000000
--- 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 d1d084800..000000000
--- 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 a71201d4b..000000000
--- 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 fb0d48115..000000000
--- 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 ec1913803..000000000
--- 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 bfc23ba35..000000000
--- 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 cf3eb022c..000000000
--- 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 9ffa55fe4..000000000
--- 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 72ff59556..000000000
--- 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 ec1913803..000000000
--- 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 fb0d48115..000000000
--- 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 ec1913803..000000000
--- 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 a620c9e5b..000000000
--- 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 d660bc5d1..000000000
--- 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 79952ecc3..000000000
--- 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 b2ae89a5f..000000000
--- 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 8d652f7ee..000000000
--- 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 19b799f7b..000000000
--- 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 3c793e4f9..000000000
--- 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 b1ce82439..000000000
--- 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 f83321591..000000000
--- 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 8d652f7ee..000000000
--- 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 ae5be7eea..000000000
--- 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 ae34844ea..000000000
--- 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 aa39615e7..000000000
--- 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 ec1913803..000000000
--- 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 746e2aa58..000000000
--- 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 58cc9e37c..000000000
--- 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 95d42029a..000000000
--- 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 55936981d..000000000
--- 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 ec1913803..000000000
--- 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 6790aeeff..000000000
--- 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 ec1913803..000000000
--- 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 2d3f514d5..000000000
--- 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 681863036..000000000
--- 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 a838fa8ac..000000000
--- 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 ec1913803..000000000
--- 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 6b73e957f..000000000
--- 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 bcf6f43e7..000000000
--- 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 4806db155..000000000
--- 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 21de3ece3..000000000
--- 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 ec1913803..000000000
--- 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 a838fa8ac..000000000
--- 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 ec1913803..000000000
--- 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 1c8e0612c..000000000
--- 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 a4b0147fb..000000000
--- 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 546c2a210..000000000
--- a/docker/centos/source/neutron/neutron-agents/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-# Install supervisor
-RUN easy_install supervisor
-
-# Install supervisor-stdout
-RUN pip install supervisor-stdout
-
-# Configure supervisord
-RUN mkdir -p /var/log/supervisor/
-COPY supervisord.conf /etc/
-
-# TODO: SamYaple FWaaS is part of the l3-agent, not a seperate agent that is
-# why this file is needed. To support FWaaS we cannot have a seperate container
-# I need to figure out the best way to make this work together
-#
-# This file _does_ _not_ need to exist, you must remove referencing it from the
-# exec line in the start script. Also all these config options can exist in the
-# main neutron.conf if we wish
-COPY fwaas_driver.ini /etc/neutron/
-
-COPY neutron-dhcp-agent/ /opt/kolla/neutron-dhcp-agent
-COPY neutron-l3-agent/ /opt/kolla/neutron-l3-agent
-COPY neutron-metadata-agent/ /opt/kolla/neutron-metadata-agent
-
-CMD ["/usr/bin/supervisord"]
diff --git a/docker/centos/source/neutron/neutron-agents/build b/docker/centos/source/neutron/neutron-agents/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/source/neutron/neutron-agents/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/fwaas_driver.ini b/docker/centos/source/neutron/neutron-agents/fwaas_driver.ini
deleted file mode 120000
index 0e016223c..000000000
--- a/docker/centos/source/neutron/neutron-agents/fwaas_driver.ini
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/neutron/neutron-l3-agent/fwaas_driver.ini \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh b/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh
deleted file mode 120000
index 680eee875..000000000
--- a/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../common/neutron/neutron-dhcp-agent/config-external.sh \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/start.sh b/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/start.sh
deleted file mode 120000
index 63dad958d..000000000
--- a/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../common/neutron/neutron-dhcp-agent/start.sh \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/config-external.sh b/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/config-external.sh
deleted file mode 120000
index f4530afd9..000000000
--- a/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../common/neutron/neutron-l3-agent/config-external.sh \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini b/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini
deleted file mode 120000
index 8ea67959c..000000000
--- a/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../common/neutron/neutron-l3-agent/fwaas_driver.ini \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/start.sh b/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/start.sh
deleted file mode 120000
index fa70dec8b..000000000
--- a/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../common/neutron/neutron-l3-agent/start.sh \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/config-external.sh b/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/config-external.sh
deleted file mode 120000
index a5c3ac24a..000000000
--- a/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../common/neutron/neutron-metadata-agent/config-external.sh \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/start.sh b/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/start.sh
deleted file mode 120000
index 0de2452ee..000000000
--- a/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../common/neutron/neutron-metadata-agent/start.sh \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/supervisord.conf b/docker/centos/source/neutron/neutron-agents/supervisord.conf
deleted file mode 120000
index a7f24cb77..000000000
--- a/docker/centos/source/neutron/neutron-agents/supervisord.conf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/neutron/neutron-agents/supervisord.conf \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-base/.buildinfo b/docker/centos/source/neutron/neutron-base/.buildinfo
deleted file mode 100644
index b4035affb..000000000
--- a/docker/centos/source/neutron/neutron-base/.buildinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-# Build info specific to this image. All values can be overridden in .buildconf
-
-COMPONENT=neutron
-SOURCE_INSTALL_AVAILABLE=1
-
-# Used for git install method
-: ${CLONE_FROM:=https://github.com/openstack/neutron}
-
-# Used for curl install method
-: ${TARBALL_URI:=http://tarballs.openstack.org/neutron/neutron-master.tar.gz}
diff --git a/docker/centos/source/neutron/neutron-base/Dockerfile b/docker/centos/source/neutron/neutron-base/Dockerfile
deleted file mode 100644
index ee57cfedc..000000000
--- a/docker/centos/source/neutron/neutron-base/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-ADD ./neutron.tar /
-RUN ln -s /neutron-* /neutron
-
-RUN cd /neutron \
- && useradd --user-group neutron \
- && pip install -r requirements.txt \
- && pip install /neutron \
- && mkdir /etc/neutron /usr/share/neutron /var/log/neutron \
- && cp -r etc/* /etc/neutron/ \
- && cp -r etc/neutron/* /etc/neutron/ \
- && cp etc/api-paste.ini /usr/share/neutron \
- && mv /etc/neutron/neutron/ /etc/neutron/plugins/ \
- && chown -R neutron: /etc/neutron /var/log/neutron \
- && rm -rf /root/.cache
-
-COPY config-sudoers.sh /opt/kolla/
diff --git a/docker/centos/source/neutron/neutron-base/build b/docker/centos/source/neutron/neutron-base/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/source/neutron/neutron-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-base/config-sudoers.sh b/docker/centos/source/neutron/neutron-base/config-sudoers.sh
deleted file mode 120000
index 08e65f4d7..000000000
--- a/docker/centos/source/neutron/neutron-base/config-sudoers.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/neutron/neutron-base/config-sudoers.sh \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-linuxbridge-agent/Dockerfile b/docker/centos/source/neutron/neutron-linuxbridge-agent/Dockerfile
deleted file mode 100644
index ded2b7de0..000000000
--- a/docker/centos/source/neutron/neutron-linuxbridge-agent/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-# Install required packages
-RUN yum install -y ebtables && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/neutron/neutron-linuxbridge-agent/build b/docker/centos/source/neutron/neutron-linuxbridge-agent/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/source/neutron/neutron-linuxbridge-agent/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-linuxbridge-agent/config-external.sh b/docker/centos/source/neutron/neutron-linuxbridge-agent/config-external.sh
deleted file mode 120000
index 6bd77d67d..000000000
--- a/docker/centos/source/neutron/neutron-linuxbridge-agent/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/neutron/neutron-linuxbridge-agent/config-external.sh \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-linuxbridge-agent/start.sh b/docker/centos/source/neutron/neutron-linuxbridge-agent/start.sh
deleted file mode 120000
index 9d51d3d6a..000000000
--- a/docker/centos/source/neutron/neutron-linuxbridge-agent/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/neutron/neutron-linuxbridge-agent/start.sh \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-openvswitch-agent/Dockerfile b/docker/centos/source/neutron/neutron-openvswitch-agent/Dockerfile
deleted file mode 100644
index 4f447853b..000000000
--- a/docker/centos/source/neutron/neutron-openvswitch-agent/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-# Install required packages
-RUN yum install -y \
- https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm \
- openvswitch \
- && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/neutron/neutron-openvswitch-agent/build b/docker/centos/source/neutron/neutron-openvswitch-agent/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/source/neutron/neutron-openvswitch-agent/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-openvswitch-agent/config-external.sh b/docker/centos/source/neutron/neutron-openvswitch-agent/config-external.sh
deleted file mode 120000
index 14354b71a..000000000
--- a/docker/centos/source/neutron/neutron-openvswitch-agent/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/neutron/neutron-openvswitch-agent/config-external.sh \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-openvswitch-agent/start.sh b/docker/centos/source/neutron/neutron-openvswitch-agent/start.sh
deleted file mode 120000
index c14edb0ad..000000000
--- a/docker/centos/source/neutron/neutron-openvswitch-agent/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/neutron/neutron-openvswitch-agent/start.sh \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-server/Dockerfile b/docker/centos/source/neutron/neutron-server/Dockerfile
deleted file mode 100644
index f678357a0..000000000
--- a/docker/centos/source/neutron/neutron-server/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-#Install required packages
-RUN yum install -y which && \
- yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/neutron/neutron-server/build b/docker/centos/source/neutron/neutron-server/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/source/neutron/neutron-server/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-server/config-external.sh b/docker/centos/source/neutron/neutron-server/config-external.sh
deleted file mode 120000
index b8d7792ce..000000000
--- a/docker/centos/source/neutron/neutron-server/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/neutron/neutron-server/config-external.sh \ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-server/start.sh b/docker/centos/source/neutron/neutron-server/start.sh
deleted file mode 120000
index a11ea7703..000000000
--- a/docker/centos/source/neutron/neutron-server/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/neutron/neutron-server/start.sh \ No newline at end of file
diff --git a/docker/centos/source/nova/nova-api/Dockerfile b/docker/centos/source/nova/nova-api/Dockerfile
deleted file mode 100644
index 02626c2c2..000000000
--- 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 ec1913803..000000000
--- 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 fa9d355fe..000000000
--- 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 12fd6f028..000000000
--- 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 2c5f3d813..000000000
--- 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 b15dcd20c..000000000
--- 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 ec1913803..000000000
--- 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 96b234a5c..000000000
--- 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 ec1913803..000000000
--- 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 bb13b939c..000000000
--- 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 830400f9e..000000000
--- 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 f22d5b243..000000000
--- 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 ec1913803..000000000
--- 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 d98f3a875..000000000
--- 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 0eb07db61..000000000
--- 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 f22d5b243..000000000
--- 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 ec1913803..000000000
--- 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 b9d573470..000000000
--- 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 658be8e2a..000000000
--- 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 856cab73e..000000000
--- 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 ec1913803..000000000
--- 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 e16a4f542..000000000
--- 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 63ca58e26..000000000
--- 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 c8822e917..000000000
--- 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 ec1913803..000000000
--- 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 086eac04e..000000000
--- 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 89c974d80..000000000
--- 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 69c99cdf7..000000000
--- 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 ec1913803..000000000
--- 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 8d2a91810..000000000
--- 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 b57c6a318..000000000
--- 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 f22d5b243..000000000
--- 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 ec1913803..000000000
--- 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 ef9c60c29..000000000
--- 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 b73e07a6a..000000000
--- 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 c923e339e..000000000
--- 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 ec1913803..000000000
--- 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 93a15ca3b..000000000
--- 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 acf6b18d7..000000000
--- 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 ca6e05ede..000000000
--- 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 2a983963b..000000000
--- 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 ec1913803..000000000
--- 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 fb883f482..000000000
--- 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 c923e339e..000000000
--- 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 ec1913803..000000000
--- 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 8fa814ca7..000000000
--- 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 b7d3cd9fc..000000000
--- 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 eb070cce9..000000000
--- 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 ec1913803..000000000
--- 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 1adf26bcb..000000000
--- 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 5ef316559..000000000
--- 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 600d9d651..000000000
--- 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 ec1913803..000000000
--- 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 a289b4d0d..000000000
--- 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 eb070cce9..000000000
--- 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 ec1913803..000000000
--- 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 7f8d3e37e..000000000
--- 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 3b9a9c3ee..000000000
--- 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 eb070cce9..000000000
--- 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 ec1913803..000000000
--- 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 69e793df4..000000000
--- 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 da27b6312..000000000
--- 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 eb070cce9..000000000
--- 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 ec1913803..000000000
--- 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 a9213fffa..000000000
--- 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 7e47f8018..000000000
--- 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 eb070cce9..000000000
--- 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 ec1913803..000000000
--- 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 94ba9e60c..000000000
--- 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 2e78e5c09..000000000
--- 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 cbd4357f3..000000000
--- 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 ec1913803..000000000
--- 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 178516af5..000000000
--- 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 63d0ec91a..000000000
--- 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 5f46f8dd7..000000000
--- 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 3fee08aee..000000000
--- 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 8d652f7ee..000000000
--- 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 38fff40d1..000000000
--- 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 48134a044..000000000
--- a/docker/centos/source/zaqar/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/zaqar/start.sh \ No newline at end of file