Restructure builds to allow more flexibility

As a restructure, nothing is changed from the original behaviour and
naming despite the file structure changing. The symlinks to build had
to be updated generating lots of "deleted" and "new_file".

The new structure is:

docker/${base_distro}/${type}/${container}

base_distro == centos, ubuntu, fedora, etc
type == source, binary, rdo

type rdo is a symlink to binary for backwards compatibility

Two new flags are added to the build-all script to support the ability
to support different base distros and a flag to support binary or source
containers.

There are several added folders that are empty to hold the directory
structure for future containers of these types.

To use a prefix other than centos-rdo- you can set PREFIX in the toplevel
directory .buildconf file

Change-Id: Ifc7bac0d827470f506c8b5c004a833da9ce13b90

224 files changed, 62 insertions, 49 deletions

diff --git a/docker/barbican/build b/docker/barbican/build
deleted file mode 120000
index d2accf7d3..000000000
--- a/docker/barbican/build
+++ /dev/null
@@ -1 +0,0 @@
-../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/ceilometer/ceilometer-alarm/build b/docker/ceilometer/ceilometer-alarm/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/ceilometer/ceilometer-alarm/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/ceilometer/ceilometer-api/build b/docker/ceilometer/ceilometer-api/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/ceilometer/ceilometer-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/ceilometer/ceilometer-base/build b/docker/ceilometer/ceilometer-base/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/ceilometer/ceilometer-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/ceilometer/ceilometer-central/build b/docker/ceilometer/ceilometer-central/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/ceilometer/ceilometer-central/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/ceilometer/ceilometer-collector/build b/docker/ceilometer/ceilometer-collector/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/ceilometer/ceilometer-collector/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/ceilometer/ceilometer-compute/build b/docker/ceilometer/ceilometer-compute/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/ceilometer/ceilometer-compute/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/ceilometer/ceilometer-notification/build b/docker/ceilometer/ceilometer-notification/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/ceilometer/ceilometer-notification/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos-rdo-base/build b/docker/centos-rdo-base/build
deleted file mode 120000
index d2accf7d3..000000000
--- a/docker/centos-rdo-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/barbican/Dockerfile b/docker/centos/binary/barbican/Dockerfile
index 0a124dc38..0a124dc38 100644
--- a/docker/barbican/Dockerfile
+++ b/docker/centos/binary/barbican/Dockerfile
diff --git a/docker/centos/binary/barbican/build b/docker/centos/binary/barbican/build
new file mode 120000
index 000000000..8d652f7ee
--- /dev/null
+++ b/docker/centos/binary/barbican/build
@@ -0,0 +1 @@
+../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/barbican/start.sh b/docker/centos/binary/barbican/start.sh
index 673aa4339..673aa4339 100755
--- a/docker/barbican/start.sh
+++ b/docker/centos/binary/barbican/start.sh
diff --git a/docker/base/kolla-common.sh b/docker/centos/binary/base/kolla-common.sh
index 8c2ef5ec1..8c2ef5ec1 100644
--- a/docker/base/kolla-common.sh
+++ b/docker/centos/binary/base/kolla-common.sh
diff --git a/docker/base/service_hosts.sh b/docker/centos/binary/base/service_hosts.sh
index c3006f720..c3006f720 100755
--- a/docker/base/service_hosts.sh
+++ b/docker/centos/binary/base/service_hosts.sh
diff --git a/docker/ceilometer/ceilometer-alarm/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile
index fe6c44fc2..fe6c44fc2 100644
--- a/docker/ceilometer/ceilometer-alarm/Dockerfile
+++ b/docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile
diff --git a/docker/centos/binary/ceilometer/ceilometer-alarm/build b/docker/centos/binary/ceilometer/ceilometer-alarm/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/ceilometer/ceilometer-alarm/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/ceilometer/ceilometer-alarm/start.sh b/docker/centos/binary/ceilometer/ceilometer-alarm/start.sh
index 7470ae608..7470ae608 100644
--- a/docker/ceilometer/ceilometer-alarm/start.sh
+++ b/docker/centos/binary/ceilometer/ceilometer-alarm/start.sh
diff --git a/docker/ceilometer/ceilometer-api/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-api/Dockerfile
index 7a1337c7b..7a1337c7b 100644
--- a/docker/ceilometer/ceilometer-api/Dockerfile
+++ b/docker/centos/binary/ceilometer/ceilometer-api/Dockerfile
diff --git a/docker/centos/binary/ceilometer/ceilometer-api/build b/docker/centos/binary/ceilometer/ceilometer-api/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/ceilometer/ceilometer-api/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/ceilometer/ceilometer-api/start.sh b/docker/centos/binary/ceilometer/ceilometer-api/start.sh
index f081c9f84..f081c9f84 100644
--- a/docker/ceilometer/ceilometer-api/start.sh
+++ b/docker/centos/binary/ceilometer/ceilometer-api/start.sh
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-base/Dockerfile
index 6aaf77ab2..6aaf77ab2 100644
--- a/docker/ceilometer/ceilometer-base/Dockerfile
+++ b/docker/centos/binary/ceilometer/ceilometer-base/Dockerfile
diff --git a/docker/centos/binary/ceilometer/ceilometer-base/build b/docker/centos/binary/ceilometer/ceilometer-base/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/ceilometer/ceilometer-base/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/ceilometer/ceilometer-base/config-ceilometer.sh b/docker/centos/binary/ceilometer/ceilometer-base/config-ceilometer.sh
index a2316dcd1..a2316dcd1 100644
--- a/docker/ceilometer/ceilometer-base/config-ceilometer.sh
+++ b/docker/centos/binary/ceilometer/ceilometer-base/config-ceilometer.sh
diff --git a/docker/ceilometer/ceilometer-central/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-central/Dockerfile
index bd5137306..bd5137306 100644
--- a/docker/ceilometer/ceilometer-central/Dockerfile
+++ b/docker/centos/binary/ceilometer/ceilometer-central/Dockerfile
diff --git a/docker/centos/binary/ceilometer/ceilometer-central/build b/docker/centos/binary/ceilometer/ceilometer-central/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/ceilometer/ceilometer-central/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/ceilometer/ceilometer-central/start.sh b/docker/centos/binary/ceilometer/ceilometer-central/start.sh
index 76f9a1fc2..76f9a1fc2 100644
--- a/docker/ceilometer/ceilometer-central/start.sh
+++ b/docker/centos/binary/ceilometer/ceilometer-central/start.sh
diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile
index 6c54dce4a..6c54dce4a 100644
--- a/docker/ceilometer/ceilometer-collector/Dockerfile
+++ b/docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile
diff --git a/docker/centos/binary/ceilometer/ceilometer-collector/build b/docker/centos/binary/ceilometer/ceilometer-collector/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/ceilometer/ceilometer-collector/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/ceilometer/ceilometer-collector/start.sh b/docker/centos/binary/ceilometer/ceilometer-collector/start.sh
index 1ed4c9e7d..1ed4c9e7d 100644
--- a/docker/ceilometer/ceilometer-collector/start.sh
+++ b/docker/centos/binary/ceilometer/ceilometer-collector/start.sh
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile
index 9f2a701d8..9f2a701d8 100644
--- a/docker/ceilometer/ceilometer-compute/Dockerfile
+++ b/docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile
diff --git a/docker/centos/binary/ceilometer/ceilometer-compute/build b/docker/centos/binary/ceilometer/ceilometer-compute/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/ceilometer/ceilometer-compute/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/ceilometer/ceilometer-compute/start.sh b/docker/centos/binary/ceilometer/ceilometer-compute/start.sh
index f4fc30bae..f4fc30bae 100644
--- a/docker/ceilometer/ceilometer-compute/start.sh
+++ b/docker/centos/binary/ceilometer/ceilometer-compute/start.sh
diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile
index 72d291bcb..72d291bcb 100644
--- a/docker/ceilometer/ceilometer-notification/Dockerfile
+++ b/docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile
diff --git a/docker/centos/binary/ceilometer/ceilometer-notification/build b/docker/centos/binary/ceilometer/ceilometer-notification/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/ceilometer/ceilometer-notification/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/ceilometer/ceilometer-notification/start.sh b/docker/centos/binary/ceilometer/ceilometer-notification/start.sh
index 939734549..939734549 100644
--- a/docker/ceilometer/ceilometer-notification/start.sh
+++ b/docker/centos/binary/ceilometer/ceilometer-notification/start.sh
diff --git a/docker/centos-rdo-base/.buildconf b/docker/centos/binary/centos-binary-base/.buildconf
index d552b0d1b..d552b0d1b 100644
--- a/docker/centos-rdo-base/.buildconf
+++ b/docker/centos/binary/centos-binary-base/.buildconf
diff --git a/docker/centos-rdo-base/Dockerfile b/docker/centos/binary/centos-binary-base/Dockerfile
index d045ba3f5..d045ba3f5 100644
--- a/docker/centos-rdo-base/Dockerfile
+++ b/docker/centos/binary/centos-binary-base/Dockerfile
diff --git a/docker/centos/binary/centos-binary-base/build b/docker/centos/binary/centos-binary-base/build
new file mode 120000
index 000000000..8d652f7ee
--- /dev/null
+++ b/docker/centos/binary/centos-binary-base/build
@@ -0,0 +1 @@
+../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos-rdo-base/kolla-common.sh b/docker/centos/binary/centos-binary-base/kolla-common.sh
index fcd13a80e..fcd13a80e 120000
--- a/docker/centos-rdo-base/kolla-common.sh
+++ b/docker/centos/binary/centos-binary-base/kolla-common.sh
diff --git a/docker/centos-rdo-base/service_hosts.sh b/docker/centos/binary/centos-binary-base/service_hosts.sh
index c36eb4203..c36eb4203 120000
--- a/docker/centos-rdo-base/service_hosts.sh
+++ b/docker/centos/binary/centos-binary-base/service_hosts.sh
diff --git a/docker/centos/binary/centos-rdo-base b/docker/centos/binary/centos-rdo-base
new file mode 120000
index 000000000..f3b111231
--- /dev/null
+++ b/docker/centos/binary/centos-rdo-base
@@ -0,0 +1 @@
+centos-binary-base/
\ No newline at end of file
diff --git a/docker/cinder/Dockerfile b/docker/centos/binary/cinder/Dockerfile
index 3dd7eca59..3dd7eca59 100644
--- a/docker/cinder/Dockerfile
+++ b/docker/centos/binary/cinder/Dockerfile
diff --git a/docker/centos/binary/cinder/build b/docker/centos/binary/cinder/build
new file mode 120000
index 000000000..8d652f7ee
--- /dev/null
+++ b/docker/centos/binary/cinder/build
@@ -0,0 +1 @@
+../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/cinder/start.sh b/docker/centos/binary/cinder/start.sh
index c0d796f02..c0d796f02 100755
--- a/docker/cinder/start.sh
+++ b/docker/centos/binary/cinder/start.sh
diff --git a/docker/docker-compose/README.md b/docker/centos/binary/docker-compose/README.md
index a63e7fbc9..a63e7fbc9 100644
--- a/docker/docker-compose/README.md
+++ b/docker/centos/binary/docker-compose/README.md
diff --git a/docker/fedora-rdo-base/.buildconf b/docker/centos/binary/fedora-binary-base/.buildconf
index d552b0d1b..d552b0d1b 100644
--- a/docker/fedora-rdo-base/.buildconf
+++ b/docker/centos/binary/fedora-binary-base/.buildconf
diff --git a/docker/fedora-rdo-base/Dockerfile b/docker/centos/binary/fedora-binary-base/Dockerfile
index f41cac97e..f41cac97e 100644
--- a/docker/fedora-rdo-base/Dockerfile
+++ b/docker/centos/binary/fedora-binary-base/Dockerfile
diff --git a/docker/centos/binary/fedora-binary-base/build b/docker/centos/binary/fedora-binary-base/build
new file mode 120000
index 000000000..8d652f7ee
--- /dev/null
+++ b/docker/centos/binary/fedora-binary-base/build
@@ -0,0 +1 @@
+../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/fedora-rdo-base/kolla-common.sh b/docker/centos/binary/fedora-binary-base/kolla-common.sh
index fcd13a80e..fcd13a80e 120000
--- a/docker/fedora-rdo-base/kolla-common.sh
+++ b/docker/centos/binary/fedora-binary-base/kolla-common.sh
diff --git a/docker/fedora-rdo-base/service_hosts.sh b/docker/centos/binary/fedora-binary-base/service_hosts.sh
index c36eb4203..c36eb4203 120000
--- a/docker/fedora-rdo-base/service_hosts.sh
+++ b/docker/centos/binary/fedora-binary-base/service_hosts.sh
diff --git a/docker/centos/binary/fedora-rdo-base b/docker/centos/binary/fedora-rdo-base
new file mode 120000
index 000000000..a9be4eebb
--- /dev/null
+++ b/docker/centos/binary/fedora-rdo-base
@@ -0,0 +1 @@
+fedora-binary-base
\ No newline at end of file
diff --git a/docker/glance/glance-api/Dockerfile b/docker/centos/binary/glance/glance-api/Dockerfile
index a4bd45bd1..a4bd45bd1 100644
--- a/docker/glance/glance-api/Dockerfile
+++ b/docker/centos/binary/glance/glance-api/Dockerfile
diff --git a/docker/centos/binary/glance/glance-api/build b/docker/centos/binary/glance/glance-api/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/glance/glance-api/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/glance/glance-api/check.sh b/docker/centos/binary/glance/glance-api/check.sh
index f97ef70f4..f97ef70f4 100755
--- a/docker/glance/glance-api/check.sh
+++ b/docker/centos/binary/glance/glance-api/check.sh
diff --git a/docker/glance/glance-api/start.sh b/docker/centos/binary/glance/glance-api/start.sh
index c546333f4..c546333f4 100755
--- a/docker/glance/glance-api/start.sh
+++ b/docker/centos/binary/glance/glance-api/start.sh
diff --git a/docker/glance/glance-base/Dockerfile b/docker/centos/binary/glance/glance-base/Dockerfile
index dcd70678d..dcd70678d 100644
--- a/docker/glance/glance-base/Dockerfile
+++ b/docker/centos/binary/glance/glance-base/Dockerfile
diff --git a/docker/centos/binary/glance/glance-base/build b/docker/centos/binary/glance/glance-base/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/glance/glance-base/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/glance/glance-base/config-glance.sh b/docker/centos/binary/glance/glance-base/config-glance.sh
index aed044df5..aed044df5 100644
--- a/docker/glance/glance-base/config-glance.sh
+++ b/docker/centos/binary/glance/glance-base/config-glance.sh
diff --git a/docker/glance/glance-registry/Dockerfile b/docker/centos/binary/glance/glance-registry/Dockerfile
index f950ce685..f950ce685 100644
--- a/docker/glance/glance-registry/Dockerfile
+++ b/docker/centos/binary/glance/glance-registry/Dockerfile
diff --git a/docker/centos/binary/glance/glance-registry/build b/docker/centos/binary/glance/glance-registry/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/glance/glance-registry/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/glance/glance-registry/start.sh b/docker/centos/binary/glance/glance-registry/start.sh
index 5f590fb1c..5f590fb1c 100755
--- a/docker/glance/glance-registry/start.sh
+++ b/docker/centos/binary/glance/glance-registry/start.sh
diff --git a/docker/hautoproxy/Dockerfile b/docker/centos/binary/hautoproxy/Dockerfile
index 82b31eca3..82b31eca3 100644
--- a/docker/hautoproxy/Dockerfile
+++ b/docker/centos/binary/hautoproxy/Dockerfile
diff --git a/docker/centos/binary/hautoproxy/build b/docker/centos/binary/hautoproxy/build
new file mode 120000
index 000000000..8d652f7ee
--- /dev/null
+++ b/docker/centos/binary/hautoproxy/build
@@ -0,0 +1 @@
+../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/hautoproxy/haproxy.cfg.tmpl b/docker/centos/binary/hautoproxy/haproxy.cfg.tmpl
index cd1174b21..cd1174b21 100644
--- a/docker/hautoproxy/haproxy.cfg.tmpl
+++ b/docker/centos/binary/hautoproxy/haproxy.cfg.tmpl
diff --git a/docker/hautoproxy/start.py b/docker/centos/binary/hautoproxy/start.py
index 877b22157..877b22157 100755
--- a/docker/hautoproxy/start.py
+++ b/docker/centos/binary/hautoproxy/start.py
diff --git a/docker/heat/heat-api-cfn/Dockerfile b/docker/centos/binary/heat/heat-api-cfn/Dockerfile
index 18a7e369d..18a7e369d 100644
--- a/docker/heat/heat-api-cfn/Dockerfile
+++ b/docker/centos/binary/heat/heat-api-cfn/Dockerfile
diff --git a/docker/centos/binary/heat/heat-api-cfn/build b/docker/centos/binary/heat/heat-api-cfn/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/heat/heat-api-cfn/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/heat/heat-api-cfn/check.sh b/docker/centos/binary/heat/heat-api-cfn/check.sh
index ee03dc6d2..ee03dc6d2 100755
--- a/docker/heat/heat-api-cfn/check.sh
+++ b/docker/centos/binary/heat/heat-api-cfn/check.sh
diff --git a/docker/heat/heat-api-cfn/start.sh b/docker/centos/binary/heat/heat-api-cfn/start.sh
index bcd72250b..bcd72250b 100755
--- a/docker/heat/heat-api-cfn/start.sh
+++ b/docker/centos/binary/heat/heat-api-cfn/start.sh
diff --git a/docker/heat/heat-api/Dockerfile b/docker/centos/binary/heat/heat-api/Dockerfile
index 407aee601..407aee601 100644
--- a/docker/heat/heat-api/Dockerfile
+++ b/docker/centos/binary/heat/heat-api/Dockerfile
diff --git a/docker/centos/binary/heat/heat-api/build b/docker/centos/binary/heat/heat-api/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/heat/heat-api/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/heat/heat-api/check.sh b/docker/centos/binary/heat/heat-api/check.sh
index ee03dc6d2..ee03dc6d2 100755
--- a/docker/heat/heat-api/check.sh
+++ b/docker/centos/binary/heat/heat-api/check.sh
diff --git a/docker/heat/heat-api/start.sh b/docker/centos/binary/heat/heat-api/start.sh
index b57aaa710..b57aaa710 100755
--- a/docker/heat/heat-api/start.sh
+++ b/docker/centos/binary/heat/heat-api/start.sh
diff --git a/docker/heat/heat-base/Dockerfile b/docker/centos/binary/heat/heat-base/Dockerfile
index ebe9fa15c..ebe9fa15c 100644
--- a/docker/heat/heat-base/Dockerfile
+++ b/docker/centos/binary/heat/heat-base/Dockerfile
diff --git a/docker/centos/binary/heat/heat-base/build b/docker/centos/binary/heat/heat-base/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/heat/heat-base/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/heat/heat-base/config-heat.sh b/docker/centos/binary/heat/heat-base/config-heat.sh
index 74b2718a4..74b2718a4 100755
--- a/docker/heat/heat-base/config-heat.sh
+++ b/docker/centos/binary/heat/heat-base/config-heat.sh
diff --git a/docker/heat/heat-engine/Dockerfile b/docker/centos/binary/heat/heat-engine/Dockerfile
index 227ac335d..227ac335d 100644
--- a/docker/heat/heat-engine/Dockerfile
+++ b/docker/centos/binary/heat/heat-engine/Dockerfile
diff --git a/docker/centos/binary/heat/heat-engine/build b/docker/centos/binary/heat/heat-engine/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/heat/heat-engine/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/heat/heat-engine/start.sh b/docker/centos/binary/heat/heat-engine/start.sh
index 2dfc78e92..2dfc78e92 100755
--- a/docker/heat/heat-engine/start.sh
+++ b/docker/centos/binary/heat/heat-engine/start.sh
diff --git a/docker/horizon/Dockerfile b/docker/centos/binary/horizon/Dockerfile
index 2c34ee03a..2c34ee03a 100644
--- a/docker/horizon/Dockerfile
+++ b/docker/centos/binary/horizon/Dockerfile
diff --git a/docker/centos/binary/horizon/build b/docker/centos/binary/horizon/build
new file mode 120000
index 000000000..8d652f7ee
--- /dev/null
+++ b/docker/centos/binary/horizon/build
@@ -0,0 +1 @@
+../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/horizon/start.sh b/docker/centos/binary/horizon/start.sh
index 4e720bb87..4e720bb87 100755
--- a/docker/horizon/start.sh
+++ b/docker/centos/binary/horizon/start.sh
diff --git a/docker/keystone/Dockerfile b/docker/centos/binary/keystone/Dockerfile
index 377ef7b4f..377ef7b4f 100644
--- a/docker/keystone/Dockerfile
+++ b/docker/centos/binary/keystone/Dockerfile
diff --git a/docker/centos/binary/keystone/build b/docker/centos/binary/keystone/build
new file mode 120000
index 000000000..8d652f7ee
--- /dev/null
+++ b/docker/centos/binary/keystone/build
@@ -0,0 +1 @@
+../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/keystone/check.sh b/docker/centos/binary/keystone/check.sh
index ca4844784..ca4844784 100755
--- a/docker/keystone/check.sh
+++ b/docker/centos/binary/keystone/check.sh
diff --git a/docker/keystone/start.sh b/docker/centos/binary/keystone/start.sh
index 408f250e0..408f250e0 100755
--- a/docker/keystone/start.sh
+++ b/docker/centos/binary/keystone/start.sh
diff --git a/docker/magnum/magnum-api/Dockerfile b/docker/centos/binary/magnum/magnum-api/Dockerfile
index 84efa2a92..84efa2a92 100644
--- a/docker/magnum/magnum-api/Dockerfile
+++ b/docker/centos/binary/magnum/magnum-api/Dockerfile
diff --git a/docker/centos/binary/magnum/magnum-api/build b/docker/centos/binary/magnum/magnum-api/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/magnum/magnum-api/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/magnum/magnum-api/check.sh b/docker/centos/binary/magnum/magnum-api/check.sh
index ee03dc6d2..ee03dc6d2 100755
--- a/docker/magnum/magnum-api/check.sh
+++ b/docker/centos/binary/magnum/magnum-api/check.sh
diff --git a/docker/magnum/magnum-api/start.sh b/docker/centos/binary/magnum/magnum-api/start.sh
index 00a51b3cd..00a51b3cd 100755
--- a/docker/magnum/magnum-api/start.sh
+++ b/docker/centos/binary/magnum/magnum-api/start.sh
diff --git a/docker/magnum/magnum-base/Dockerfile b/docker/centos/binary/magnum/magnum-base/Dockerfile
index c9c3db08b..c9c3db08b 100644
--- a/docker/magnum/magnum-base/Dockerfile
+++ b/docker/centos/binary/magnum/magnum-base/Dockerfile
diff --git a/docker/centos/binary/magnum/magnum-base/build b/docker/centos/binary/magnum/magnum-base/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/magnum/magnum-base/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/magnum/magnum-base/config-magnum.sh b/docker/centos/binary/magnum/magnum-base/config-magnum.sh
index 03599d359..03599d359 100755
--- a/docker/magnum/magnum-base/config-magnum.sh
+++ b/docker/centos/binary/magnum/magnum-base/config-magnum.sh
diff --git a/docker/magnum/magnum-conductor/Dockerfile b/docker/centos/binary/magnum/magnum-conductor/Dockerfile
index f3d506cb8..f3d506cb8 100644
--- a/docker/magnum/magnum-conductor/Dockerfile
+++ b/docker/centos/binary/magnum/magnum-conductor/Dockerfile
diff --git a/docker/centos/binary/magnum/magnum-conductor/build b/docker/centos/binary/magnum/magnum-conductor/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/magnum/magnum-conductor/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/magnum/magnum-conductor/start.sh b/docker/centos/binary/magnum/magnum-conductor/start.sh
index 4cf1291a3..4cf1291a3 100755
--- a/docker/magnum/magnum-conductor/start.sh
+++ b/docker/centos/binary/magnum/magnum-conductor/start.sh
diff --git a/docker/mariadb-app/Dockerfile b/docker/centos/binary/mariadb-app/Dockerfile
index dc4025454..dc4025454 100644
--- a/docker/mariadb-app/Dockerfile
+++ b/docker/centos/binary/mariadb-app/Dockerfile
diff --git a/docker/centos/binary/mariadb-app/build b/docker/centos/binary/mariadb-app/build
new file mode 120000
index 000000000..8d652f7ee
--- /dev/null
+++ b/docker/centos/binary/mariadb-app/build
@@ -0,0 +1 @@
+../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/mariadb-app/config-mysql.sh b/docker/centos/binary/mariadb-app/config-mysql.sh
index 0d39fa870..0d39fa870 100755
--- a/docker/mariadb-app/config-mysql.sh
+++ b/docker/centos/binary/mariadb-app/config-mysql.sh
diff --git a/docker/mariadb-app/mysql-entrypoint.sh b/docker/centos/binary/mariadb-app/mysql-entrypoint.sh
index 1b4a559f1..1b4a559f1 100755
--- a/docker/mariadb-app/mysql-entrypoint.sh
+++ b/docker/centos/binary/mariadb-app/mysql-entrypoint.sh
diff --git a/docker/mariadb-data/Dockerfile b/docker/centos/binary/mariadb-data/Dockerfile
index f60599d16..f60599d16 100644
--- a/docker/mariadb-data/Dockerfile
+++ b/docker/centos/binary/mariadb-data/Dockerfile
diff --git a/docker/centos/binary/mariadb-data/build b/docker/centos/binary/mariadb-data/build
new file mode 120000
index 000000000..8d652f7ee
--- /dev/null
+++ b/docker/centos/binary/mariadb-data/build
@@ -0,0 +1 @@
+../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/mongodb/Dockerfile b/docker/centos/binary/mongodb/Dockerfile
index e05047f02..e05047f02 100644
--- a/docker/mongodb/Dockerfile
+++ b/docker/centos/binary/mongodb/Dockerfile
diff --git a/docker/centos/binary/mongodb/build b/docker/centos/binary/mongodb/build
new file mode 120000
index 000000000..8d652f7ee
--- /dev/null
+++ b/docker/centos/binary/mongodb/build
@@ -0,0 +1 @@
+../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/neutron/neutron-agents/Dockerfile b/docker/centos/binary/neutron/neutron-agents/Dockerfile
index 89ce874bb..89ce874bb 100644
--- a/docker/neutron/neutron-agents/Dockerfile
+++ b/docker/centos/binary/neutron/neutron-agents/Dockerfile
diff --git a/docker/centos/binary/neutron/neutron-agents/build b/docker/centos/binary/neutron/neutron-agents/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/neutron/neutron-agents/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/neutron/neutron-agents/check-scripts/check-dhcp-agent.sh b/docker/centos/binary/neutron/neutron-agents/check-scripts/check-dhcp-agent.sh
index 7dda736ef..7dda736ef 100755
--- a/docker/neutron/neutron-agents/check-scripts/check-dhcp-agent.sh
+++ b/docker/centos/binary/neutron/neutron-agents/check-scripts/check-dhcp-agent.sh
diff --git a/docker/neutron/neutron-agents/check-scripts/check-l3-agent.sh b/docker/centos/binary/neutron/neutron-agents/check-scripts/check-l3-agent.sh
index d32c1e272..d32c1e272 100755
--- a/docker/neutron/neutron-agents/check-scripts/check-l3-agent.sh
+++ b/docker/centos/binary/neutron/neutron-agents/check-scripts/check-l3-agent.sh
diff --git a/docker/neutron/neutron-agents/check-scripts/check-linuxbridge-agent.sh b/docker/centos/binary/neutron/neutron-agents/check-scripts/check-linuxbridge-agent.sh
index 4485fc1ec..4485fc1ec 100755
--- a/docker/neutron/neutron-agents/check-scripts/check-linuxbridge-agent.sh
+++ b/docker/centos/binary/neutron/neutron-agents/check-scripts/check-linuxbridge-agent.sh
diff --git a/docker/neutron/neutron-agents/check-scripts/check-metadata-agent.sh b/docker/centos/binary/neutron/neutron-agents/check-scripts/check-metadata-agent.sh
index fd1c6812b..fd1c6812b 100755
--- a/docker/neutron/neutron-agents/check-scripts/check-metadata-agent.sh
+++ b/docker/centos/binary/neutron/neutron-agents/check-scripts/check-metadata-agent.sh
diff --git a/docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh b/docker/centos/binary/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh
index 1295d9c57..1295d9c57 100755
--- a/docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh
+++ b/docker/centos/binary/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh
diff --git a/docker/neutron/neutron-agents/config-scripts/config-l3-agent.sh b/docker/centos/binary/neutron/neutron-agents/config-scripts/config-l3-agent.sh
index 9bb7168cd..9bb7168cd 100755
--- a/docker/neutron/neutron-agents/config-scripts/config-l3-agent.sh
+++ b/docker/centos/binary/neutron/neutron-agents/config-scripts/config-l3-agent.sh
diff --git a/docker/neutron/neutron-agents/config-scripts/config-linuxbridge-agent.sh b/docker/centos/binary/neutron/neutron-agents/config-scripts/config-linuxbridge-agent.sh
index fbf540f6e..fbf540f6e 100755
--- a/docker/neutron/neutron-agents/config-scripts/config-linuxbridge-agent.sh
+++ b/docker/centos/binary/neutron/neutron-agents/config-scripts/config-linuxbridge-agent.sh
diff --git a/docker/neutron/neutron-agents/config-scripts/config-metadata-agent.sh b/docker/centos/binary/neutron/neutron-agents/config-scripts/config-metadata-agent.sh
index d1eef341c..d1eef341c 100755
--- a/docker/neutron/neutron-agents/config-scripts/config-metadata-agent.sh
+++ b/docker/centos/binary/neutron/neutron-agents/config-scripts/config-metadata-agent.sh
diff --git a/docker/neutron/neutron-agents/config-scripts/config-sudoers.sh b/docker/centos/binary/neutron/neutron-agents/config-scripts/config-sudoers.sh
index 198420026..198420026 100755
--- a/docker/neutron/neutron-agents/config-scripts/config-sudoers.sh
+++ b/docker/centos/binary/neutron/neutron-agents/config-scripts/config-sudoers.sh
diff --git a/docker/neutron/neutron-agents/fwaas_driver.ini b/docker/centos/binary/neutron/neutron-agents/fwaas_driver.ini
index 41f761abf..41f761abf 100644
--- a/docker/neutron/neutron-agents/fwaas_driver.ini
+++ b/docker/centos/binary/neutron/neutron-agents/fwaas_driver.ini
diff --git a/docker/neutron/neutron-agents/supervisord.conf b/docker/centos/binary/neutron/neutron-agents/supervisord.conf
index 7455cb3d7..7455cb3d7 100644
--- a/docker/neutron/neutron-agents/supervisord.conf
+++ b/docker/centos/binary/neutron/neutron-agents/supervisord.conf
diff --git a/docker/neutron/neutron-base/Dockerfile b/docker/centos/binary/neutron/neutron-base/Dockerfile
index c8a5ef2d9..c8a5ef2d9 100644
--- a/docker/neutron/neutron-base/Dockerfile
+++ b/docker/centos/binary/neutron/neutron-base/Dockerfile
diff --git a/docker/centos/binary/neutron/neutron-base/build b/docker/centos/binary/neutron/neutron-base/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/neutron/neutron-base/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/neutron/neutron-base/config-neutron.sh b/docker/centos/binary/neutron/neutron-base/config-neutron.sh
index 8f6c87534..8f6c87534 100644
--- a/docker/neutron/neutron-base/config-neutron.sh
+++ b/docker/centos/binary/neutron/neutron-base/config-neutron.sh
diff --git a/docker/neutron/neutron-server/Dockerfile b/docker/centos/binary/neutron/neutron-server/Dockerfile
index 8d59dd04a..8d59dd04a 100644
--- a/docker/neutron/neutron-server/Dockerfile
+++ b/docker/centos/binary/neutron/neutron-server/Dockerfile
diff --git a/docker/centos/binary/neutron/neutron-server/build b/docker/centos/binary/neutron/neutron-server/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/neutron/neutron-server/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/neutron/neutron-server/check.sh b/docker/centos/binary/neutron/neutron-server/check.sh
index 4e9aa623c..4e9aa623c 100755
--- a/docker/neutron/neutron-server/check.sh
+++ b/docker/centos/binary/neutron/neutron-server/check.sh
diff --git a/docker/neutron/neutron-server/start.sh b/docker/centos/binary/neutron/neutron-server/start.sh
index aaaa7a994..aaaa7a994 100755
--- a/docker/neutron/neutron-server/start.sh
+++ b/docker/centos/binary/neutron/neutron-server/start.sh
diff --git a/docker/nova-base/Dockerfile b/docker/centos/binary/nova-base/Dockerfile
index d116ac973..d116ac973 100644
--- a/docker/nova-base/Dockerfile
+++ b/docker/centos/binary/nova-base/Dockerfile
diff --git a/docker/centos/binary/nova-base/build b/docker/centos/binary/nova-base/build
new file mode 120000
index 000000000..8d652f7ee
--- /dev/null
+++ b/docker/centos/binary/nova-base/build
@@ -0,0 +1 @@
+../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-base/config-nova.sh b/docker/centos/binary/nova-base/config-nova.sh
index b5172ee80..b5172ee80 100755
--- a/docker/nova-base/config-nova.sh
+++ b/docker/centos/binary/nova-base/config-nova.sh
diff --git a/docker/nova-compute/nova-compute-data/Dockerfile b/docker/centos/binary/nova-compute/nova-compute-data/Dockerfile
index 0af407095..0af407095 100644
--- a/docker/nova-compute/nova-compute-data/Dockerfile
+++ b/docker/centos/binary/nova-compute/nova-compute-data/Dockerfile
diff --git a/docker/centos/binary/nova-compute/nova-compute-data/build b/docker/centos/binary/nova-compute/nova-compute-data/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/nova-compute/nova-compute-data/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-compute/nova-compute/Dockerfile b/docker/centos/binary/nova-compute/nova-compute/Dockerfile
index d23b86e5f..d23b86e5f 100644
--- a/docker/nova-compute/nova-compute/Dockerfile
+++ b/docker/centos/binary/nova-compute/nova-compute/Dockerfile
diff --git a/docker/centos/binary/nova-compute/nova-compute/build b/docker/centos/binary/nova-compute/nova-compute/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/nova-compute/nova-compute/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-compute/nova-compute/config-nova-compute.sh b/docker/centos/binary/nova-compute/nova-compute/config-nova-compute.sh
index 81a2e3fe3..81a2e3fe3 100755
--- a/docker/nova-compute/nova-compute/config-nova-compute.sh
+++ b/docker/centos/binary/nova-compute/nova-compute/config-nova-compute.sh
diff --git a/docker/nova-compute/nova-compute/start.sh b/docker/centos/binary/nova-compute/nova-compute/start.sh
index ce3d0c0c3..ce3d0c0c3 100755
--- a/docker/nova-compute/nova-compute/start.sh
+++ b/docker/centos/binary/nova-compute/nova-compute/start.sh
diff --git a/docker/nova-compute/nova-libvirt/Dockerfile b/docker/centos/binary/nova-compute/nova-libvirt/Dockerfile
index 980940615..980940615 100644
--- a/docker/nova-compute/nova-libvirt/Dockerfile
+++ b/docker/centos/binary/nova-compute/nova-libvirt/Dockerfile
diff --git a/docker/centos/binary/nova-compute/nova-libvirt/build b/docker/centos/binary/nova-compute/nova-libvirt/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/nova-compute/nova-libvirt/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-compute/nova-libvirt/start.sh b/docker/centos/binary/nova-compute/nova-libvirt/start.sh
index 47a09399b..47a09399b 100755
--- a/docker/nova-compute/nova-libvirt/start.sh
+++ b/docker/centos/binary/nova-compute/nova-libvirt/start.sh
diff --git a/docker/nova-compute/nova-network/Dockerfile b/docker/centos/binary/nova-compute/nova-network/Dockerfile
index 2434dbdf0..2434dbdf0 100644
--- a/docker/nova-compute/nova-network/Dockerfile
+++ b/docker/centos/binary/nova-compute/nova-network/Dockerfile
diff --git a/docker/centos/binary/nova-compute/nova-network/build b/docker/centos/binary/nova-compute/nova-network/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/nova-compute/nova-network/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-compute/nova-network/config-nova-network.sh b/docker/centos/binary/nova-compute/nova-network/config-nova-network.sh
index 6976d3a20..6976d3a20 100755
--- a/docker/nova-compute/nova-network/config-nova-network.sh
+++ b/docker/centos/binary/nova-compute/nova-network/config-nova-network.sh
diff --git a/docker/nova-compute/nova-network/start.sh b/docker/centos/binary/nova-compute/nova-network/start.sh
index 92381b720..92381b720 100755
--- a/docker/nova-compute/nova-network/start.sh
+++ b/docker/centos/binary/nova-compute/nova-network/start.sh
diff --git a/docker/nova-controller/nova-api/Dockerfile b/docker/centos/binary/nova-controller/nova-api/Dockerfile
index 7abd32087..7abd32087 100644
--- a/docker/nova-controller/nova-api/Dockerfile
+++ b/docker/centos/binary/nova-controller/nova-api/Dockerfile
diff --git a/docker/centos/binary/nova-controller/nova-api/build b/docker/centos/binary/nova-controller/nova-api/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/nova-controller/nova-api/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-controller/nova-api/check.sh b/docker/centos/binary/nova-controller/nova-api/check.sh
index b250682d8..b250682d8 100755
--- a/docker/nova-controller/nova-api/check.sh
+++ b/docker/centos/binary/nova-controller/nova-api/check.sh
diff --git a/docker/nova-controller/nova-api/start.sh b/docker/centos/binary/nova-controller/nova-api/start.sh
index 7928370a4..7928370a4 100755
--- a/docker/nova-controller/nova-api/start.sh
+++ b/docker/centos/binary/nova-controller/nova-api/start.sh
diff --git a/docker/nova-controller/nova-conductor/Dockerfile b/docker/centos/binary/nova-controller/nova-conductor/Dockerfile
index f91113bad..f91113bad 100644
--- a/docker/nova-controller/nova-conductor/Dockerfile
+++ b/docker/centos/binary/nova-controller/nova-conductor/Dockerfile
diff --git a/docker/centos/binary/nova-controller/nova-conductor/build b/docker/centos/binary/nova-controller/nova-conductor/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/nova-controller/nova-conductor/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-controller/nova-conductor/start.sh b/docker/centos/binary/nova-controller/nova-conductor/start.sh
index 5e01b7f30..5e01b7f30 100755
--- a/docker/nova-controller/nova-conductor/start.sh
+++ b/docker/centos/binary/nova-controller/nova-conductor/start.sh
diff --git a/docker/nova-controller/nova-consoleauth/Dockerfile b/docker/centos/binary/nova-controller/nova-consoleauth/Dockerfile
index 576c91b5a..576c91b5a 100644
--- a/docker/nova-controller/nova-consoleauth/Dockerfile
+++ b/docker/centos/binary/nova-controller/nova-consoleauth/Dockerfile
diff --git a/docker/centos/binary/nova-controller/nova-consoleauth/build b/docker/centos/binary/nova-controller/nova-consoleauth/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/nova-controller/nova-consoleauth/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-controller/nova-consoleauth/start.sh b/docker/centos/binary/nova-controller/nova-consoleauth/start.sh
index a1b0864ac..a1b0864ac 100755
--- a/docker/nova-controller/nova-consoleauth/start.sh
+++ b/docker/centos/binary/nova-controller/nova-consoleauth/start.sh
diff --git a/docker/nova-controller/nova-novncproxy/Dockerfile b/docker/centos/binary/nova-controller/nova-novncproxy/Dockerfile
index 682625853..682625853 100644
--- a/docker/nova-controller/nova-novncproxy/Dockerfile
+++ b/docker/centos/binary/nova-controller/nova-novncproxy/Dockerfile
diff --git a/docker/centos/binary/nova-controller/nova-novncproxy/build b/docker/centos/binary/nova-controller/nova-novncproxy/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/nova-controller/nova-novncproxy/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-controller/nova-novncproxy/start.sh b/docker/centos/binary/nova-controller/nova-novncproxy/start.sh
index 9edafbca3..9edafbca3 100755
--- a/docker/nova-controller/nova-novncproxy/start.sh
+++ b/docker/centos/binary/nova-controller/nova-novncproxy/start.sh
diff --git a/docker/nova-controller/nova-scheduler/Dockerfile b/docker/centos/binary/nova-controller/nova-scheduler/Dockerfile
index 2eec47554..2eec47554 100644
--- a/docker/nova-controller/nova-scheduler/Dockerfile
+++ b/docker/centos/binary/nova-controller/nova-scheduler/Dockerfile
diff --git a/docker/centos/binary/nova-controller/nova-scheduler/build b/docker/centos/binary/nova-controller/nova-scheduler/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/nova-controller/nova-scheduler/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-controller/nova-scheduler/start.sh b/docker/centos/binary/nova-controller/nova-scheduler/start.sh
index 504c049ed..504c049ed 100755
--- a/docker/nova-controller/nova-scheduler/start.sh
+++ b/docker/centos/binary/nova-controller/nova-scheduler/start.sh
diff --git a/docker/rabbitmq/Dockerfile b/docker/centos/binary/rabbitmq/Dockerfile
index 9212d15eb..9212d15eb 100644
--- a/docker/rabbitmq/Dockerfile
+++ b/docker/centos/binary/rabbitmq/Dockerfile
diff --git a/docker/centos/binary/rabbitmq/build b/docker/centos/binary/rabbitmq/build
new file mode 120000
index 000000000..8d652f7ee
--- /dev/null
+++ b/docker/centos/binary/rabbitmq/build
@@ -0,0 +1 @@
+../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/rabbitmq/rabbitmq-env.conf b/docker/centos/binary/rabbitmq/rabbitmq-env.conf
index e76f18f0b..e76f18f0b 100644
--- a/docker/rabbitmq/rabbitmq-env.conf
+++ b/docker/centos/binary/rabbitmq/rabbitmq-env.conf
diff --git a/docker/rabbitmq/rabbitmq.config b/docker/centos/binary/rabbitmq/rabbitmq.config
index 15a47eba1..15a47eba1 100644
--- a/docker/rabbitmq/rabbitmq.config
+++ b/docker/centos/binary/rabbitmq/rabbitmq.config
diff --git a/docker/rabbitmq/start.sh b/docker/centos/binary/rabbitmq/start.sh
index 3284368f3..3284368f3 100755
--- a/docker/rabbitmq/start.sh
+++ b/docker/centos/binary/rabbitmq/start.sh
diff --git a/docker/rhel-osp-base/Dockerfile b/docker/centos/binary/rhel-osp-base/Dockerfile
index 422875dd6..422875dd6 100644
--- a/docker/rhel-osp-base/Dockerfile
+++ b/docker/centos/binary/rhel-osp-base/Dockerfile
diff --git a/docker/centos/binary/rhel-osp-base/build b/docker/centos/binary/rhel-osp-base/build
new file mode 120000
index 000000000..8d652f7ee
--- /dev/null
+++ b/docker/centos/binary/rhel-osp-base/build
@@ -0,0 +1 @@
+../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/swift/swift-account/Dockerfile b/docker/centos/binary/swift/swift-account/Dockerfile
index 2c26802e3..2c26802e3 100644
--- a/docker/swift/swift-account/Dockerfile
+++ b/docker/centos/binary/swift/swift-account/Dockerfile
diff --git a/docker/centos/binary/swift/swift-account/build b/docker/centos/binary/swift/swift-account/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/swift/swift-account/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/swift/swift-account/start.sh b/docker/centos/binary/swift/swift-account/start.sh
index f634f6e54..f634f6e54 100644
--- a/docker/swift/swift-account/start.sh
+++ b/docker/centos/binary/swift/swift-account/start.sh
diff --git a/docker/swift/swift-base/24q124 b/docker/centos/binary/swift/swift-base/24q124
index 99e00593e..99e00593e 100644
--- a/docker/swift/swift-base/24q124
+++ b/docker/centos/binary/swift/swift-base/24q124
diff --git a/docker/swift/swift-base/Dockerfile b/docker/centos/binary/swift/swift-base/Dockerfile
index 59600a23d..59600a23d 100644
--- a/docker/swift/swift-base/Dockerfile
+++ b/docker/centos/binary/swift/swift-base/Dockerfile
diff --git a/docker/centos/binary/swift/swift-base/build b/docker/centos/binary/swift/swift-base/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/swift/swift-base/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/swift/swift-container/Dockerfile b/docker/centos/binary/swift/swift-container/Dockerfile
index 2c26802e3..2c26802e3 100644
--- a/docker/swift/swift-container/Dockerfile
+++ b/docker/centos/binary/swift/swift-container/Dockerfile
diff --git a/docker/centos/binary/swift/swift-container/build b/docker/centos/binary/swift/swift-container/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/swift/swift-container/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/swift/swift-container/start.sh b/docker/centos/binary/swift/swift-container/start.sh
index 6e303872b..6e303872b 100644
--- a/docker/swift/swift-container/start.sh
+++ b/docker/centos/binary/swift/swift-container/start.sh
diff --git a/docker/swift/swift-object/Dockerfile b/docker/centos/binary/swift/swift-object/Dockerfile
index 2c26802e3..2c26802e3 100644
--- a/docker/swift/swift-object/Dockerfile
+++ b/docker/centos/binary/swift/swift-object/Dockerfile
diff --git a/docker/centos/binary/swift/swift-object/build b/docker/centos/binary/swift/swift-object/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/swift/swift-object/start.sh b/docker/centos/binary/swift/swift-object/start.sh
index 8626e7678..8626e7678 100644
--- a/docker/swift/swift-object/start.sh
+++ b/docker/centos/binary/swift/swift-object/start.sh
diff --git a/docker/swift/swift-proxy-server/Dockerfile b/docker/centos/binary/swift/swift-proxy-server/Dockerfile
index 2c26802e3..2c26802e3 100644
--- a/docker/swift/swift-proxy-server/Dockerfile
+++ b/docker/centos/binary/swift/swift-proxy-server/Dockerfile
diff --git a/docker/centos/binary/swift/swift-proxy-server/build b/docker/centos/binary/swift/swift-proxy-server/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/swift/swift-proxy-server/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/swift/swift-proxy-server/start.sh b/docker/centos/binary/swift/swift-proxy-server/start.sh
index 3f387d187..3f387d187 100644
--- a/docker/swift/swift-proxy-server/start.sh
+++ b/docker/centos/binary/swift/swift-proxy-server/start.sh
diff --git a/docker/zaqar/Dockerfile b/docker/centos/binary/zaqar/Dockerfile
index 956f90825..956f90825 100644
--- a/docker/zaqar/Dockerfile
+++ b/docker/centos/binary/zaqar/Dockerfile
diff --git a/docker/centos/binary/zaqar/build b/docker/centos/binary/zaqar/build
new file mode 120000
index 000000000..8d652f7ee
--- /dev/null
+++ b/docker/centos/binary/zaqar/build
@@ -0,0 +1 @@
+../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/zaqar/check.sh b/docker/centos/binary/zaqar/check.sh
index 4b3cdbb46..4b3cdbb46 100755
--- a/docker/zaqar/check.sh
+++ b/docker/centos/binary/zaqar/check.sh
diff --git a/docker/zaqar/start.sh b/docker/centos/binary/zaqar/start.sh
index 6c68fccf2..6c68fccf2 100755
--- a/docker/zaqar/start.sh
+++ b/docker/centos/binary/zaqar/start.sh
diff --git a/docker/centos/rdo b/docker/centos/rdo
new file mode 120000
index 000000000..cab89b7b4
--- /dev/null
+++ b/docker/centos/rdo
@@ -0,0 +1 @@
+binary
\ No newline at end of file
diff --git a/docker/cinder/build b/docker/cinder/build
deleted file mode 120000
index d2accf7d3..000000000
--- a/docker/cinder/build
+++ /dev/null
@@ -1 +0,0 @@
-../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/fedora b/docker/fedora
new file mode 120000
index 000000000..95e189549
--- /dev/null
+++ b/docker/fedora
@@ -0,0 +1 @@
+centos
\ No newline at end of file
diff --git a/docker/fedora-rdo-base/build b/docker/fedora-rdo-base/build
deleted file mode 120000
index d2accf7d3..000000000
--- a/docker/fedora-rdo-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/glance/glance-api/build b/docker/glance/glance-api/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/glance/glance-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/glance/glance-base/build b/docker/glance/glance-base/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/glance/glance-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/glance/glance-registry/build b/docker/glance/glance-registry/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/glance/glance-registry/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/hautoproxy/build b/docker/hautoproxy/build
deleted file mode 120000
index d2accf7d3..000000000
--- a/docker/hautoproxy/build
+++ /dev/null
@@ -1 +0,0 @@
-../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/heat/heat-api-cfn/build b/docker/heat/heat-api-cfn/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/heat/heat-api-cfn/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/heat/heat-api/build b/docker/heat/heat-api/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/heat/heat-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/heat/heat-base/build b/docker/heat/heat-base/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/heat/heat-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/heat/heat-engine/build b/docker/heat/heat-engine/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/heat/heat-engine/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/horizon/build b/docker/horizon/build
deleted file mode 120000
index d2accf7d3..000000000
--- a/docker/horizon/build
+++ /dev/null
@@ -1 +0,0 @@
-../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/keystone/build b/docker/keystone/build
deleted file mode 120000
index d2accf7d3..000000000
--- a/docker/keystone/build
+++ /dev/null
@@ -1 +0,0 @@
-../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/magnum/magnum-api/build b/docker/magnum/magnum-api/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/magnum/magnum-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/magnum/magnum-base/build b/docker/magnum/magnum-base/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/magnum/magnum-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/magnum/magnum-conductor/build b/docker/magnum/magnum-conductor/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/magnum/magnum-conductor/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/mariadb-app/build b/docker/mariadb-app/build
deleted file mode 120000
index d2accf7d3..000000000
--- a/docker/mariadb-app/build
+++ /dev/null
@@ -1 +0,0 @@
-../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/mariadb-data/build b/docker/mariadb-data/build
deleted file mode 120000
index d2accf7d3..000000000
--- a/docker/mariadb-data/build
+++ /dev/null
@@ -1 +0,0 @@
-../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/mongodb/build b/docker/mongodb/build
deleted file mode 120000
index d2accf7d3..000000000
--- a/docker/mongodb/build
+++ /dev/null
@@ -1 +0,0 @@
-../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/neutron/neutron-agents/build b/docker/neutron/neutron-agents/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/neutron/neutron-agents/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/neutron/neutron-base/build b/docker/neutron/neutron-base/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/neutron/neutron-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/neutron/neutron-server/build b/docker/neutron/neutron-server/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/neutron/neutron-server/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-base/build b/docker/nova-base/build
deleted file mode 120000
index d2accf7d3..000000000
--- a/docker/nova-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-compute/nova-compute-data/build b/docker/nova-compute/nova-compute-data/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/nova-compute/nova-compute-data/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-compute/nova-compute/build b/docker/nova-compute/nova-compute/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/nova-compute/nova-compute/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-compute/nova-libvirt/build b/docker/nova-compute/nova-libvirt/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/nova-compute/nova-libvirt/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-compute/nova-network/build b/docker/nova-compute/nova-network/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/nova-compute/nova-network/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-controller/nova-api/build b/docker/nova-controller/nova-api/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/nova-controller/nova-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-controller/nova-conductor/build b/docker/nova-controller/nova-conductor/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/nova-controller/nova-conductor/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-controller/nova-consoleauth/build b/docker/nova-controller/nova-consoleauth/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/nova-controller/nova-consoleauth/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-controller/nova-novncproxy/build b/docker/nova-controller/nova-novncproxy/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/nova-controller/nova-novncproxy/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-controller/nova-scheduler/build b/docker/nova-controller/nova-scheduler/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/nova-controller/nova-scheduler/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/rabbitmq/build b/docker/rabbitmq/build
deleted file mode 120000
index d2accf7d3..000000000
--- a/docker/rabbitmq/build
+++ /dev/null
@@ -1 +0,0 @@
-../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/rhel-osp-base/build b/docker/rhel-osp-base/build
deleted file mode 120000
index d2accf7d3..000000000
--- a/docker/rhel-osp-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/swift/swift-account/build b/docker/swift/swift-account/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/swift/swift-account/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/swift/swift-base/build b/docker/swift/swift-base/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/swift/swift-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/swift/swift-container/build b/docker/swift/swift-container/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/swift/swift-container/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/swift/swift-object/build b/docker/swift/swift-object/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/swift/swift-object/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/swift/swift-proxy-server/build b/docker/swift/swift-proxy-server/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/swift/swift-proxy-server/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/zaqar/build b/docker/zaqar/build
deleted file mode 120000
index d2accf7d3..000000000
--- a/docker/zaqar/build
+++ /dev/null
@@ -1 +0,0 @@
-../../tools/build-docker-image
\ No newline at end of file
diff --git a/tools/build-all-docker-images b/tools/build-all-docker-images
index 1a6fbb17c..ed8c526da 100755
--- a/tools/build-all-docker-images
+++ b/tools/build-all-docker-images
@@ -29,6 +29,7 @@ function warn {
 function set_defaults {
     PREFIX=centos-rdo-
     NAMESPACE=kollaglue
+    [ -f $WORKDIR/.buildconf ] && . $WORKDIR/.buildconf
 }
 
 function has_changed {
@@ -191,8 +192,16 @@ while :; do
     shift
 done
 
+set_defaults
+
+# BASE == centos, fedora, ubuntu, etc.
+BASE=$(echo "${PREFIX}" | cut -d- -f1)
+# TYPE == binary, source, rdo
+TYPE=$(echo "${PREFIX}" | cut -d- -f2)
+
+
 # Do a first pass to find images to build and their dependencies
-for dockerfile in $(find $DOCKERDIR -name Dockerfile); do
+for dockerfile in $(find "${DOCKERDIR}/${BASE}/${TYPE}" -name Dockerfile); do
     init_image $(dirname $dockerfile)
 done