Move docker_templates to docker dir

Updated build.py to reflect this change.
Deprecate --template option and make it a noop.

Change-Id: I7cd98d1ee684a4c64984a49597159868152683b2
Partially-Implements: blueprint remove-docker-dir

224 files changed, 10 insertions, 30 deletions

diff --git a/README.rst b/README.rst
index 5bab37cf5..7bcc693c8 100644
--- a/README.rst
+++ b/README.rst
@@ -75,8 +75,7 @@ Directories
 -  etc - Contains a reference etc directory structure which requires
    configuration of a small number of configuration variables to achieve
    a working All-in-One (AIO) deployment.
--  docker\_templates - Contains jinja2 templates for the docker build
-   system.
+-  docker - Contains jinja2 templates for the docker build system.
 -  tools - Contains tools for interacting with Kolla.
 -  specs - Contains the Kolla communities key arguments about
    architectural shifts in the code base.
diff --git a/docker_templates/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index b3b0c776a..b3b0c776a 100755
--- a/docker_templates/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
diff --git a/docker_templates/base/kolla-common.sh b/docker/base/kolla-common.sh
index cc960ca24..cc960ca24 100644
--- a/docker_templates/base/kolla-common.sh
+++ b/docker/base/kolla-common.sh
diff --git a/docker_templates/base/mariadb.yum.repo b/docker/base/mariadb.yum.repo
index 564ce3f0e..564ce3f0e 100644
--- a/docker_templates/base/mariadb.yum.repo
+++ b/docker/base/mariadb.yum.repo
diff --git a/docker_templates/base/sources.list b/docker/base/sources.list
index ccb6f8d25..ccb6f8d25 100644
--- a/docker_templates/base/sources.list
+++ b/docker/base/sources.list
diff --git a/docker_templates/ceilometer/ceilometer-alarm/Dockerfile.j2 b/docker/ceilometer/ceilometer-alarm/Dockerfile.j2
index aa62562ac..aa62562ac 100644
--- a/docker_templates/ceilometer/ceilometer-alarm/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-alarm/Dockerfile.j2
diff --git a/docker_templates/ceilometer/ceilometer-alarm/config-external.sh b/docker/ceilometer/ceilometer-alarm/config-external.sh
index 2835bd5aa..2835bd5aa 100644
--- a/docker_templates/ceilometer/ceilometer-alarm/config-external.sh
+++ b/docker/ceilometer/ceilometer-alarm/config-external.sh
diff --git a/docker_templates/ceilometer/ceilometer-alarm/start.sh b/docker/ceilometer/ceilometer-alarm/start.sh
index ab5501b23..ab5501b23 100755
--- a/docker_templates/ceilometer/ceilometer-alarm/start.sh
+++ b/docker/ceilometer/ceilometer-alarm/start.sh
diff --git a/docker_templates/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2
index 805e5e8eb..805e5e8eb 100644
--- a/docker_templates/ceilometer/ceilometer-api/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2
diff --git a/docker_templates/ceilometer/ceilometer-api/config-external.sh b/docker/ceilometer/ceilometer-api/config-external.sh
index 2835bd5aa..2835bd5aa 100644
--- a/docker_templates/ceilometer/ceilometer-api/config-external.sh
+++ b/docker/ceilometer/ceilometer-api/config-external.sh
diff --git a/docker_templates/ceilometer/ceilometer-api/start.sh b/docker/ceilometer/ceilometer-api/start.sh
index 0f660e025..0f660e025 100755
--- a/docker_templates/ceilometer/ceilometer-api/start.sh
+++ b/docker/ceilometer/ceilometer-api/start.sh
diff --git a/docker_templates/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2
index 92a3b70d9..92a3b70d9 100644
--- a/docker_templates/ceilometer/ceilometer-base/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2
diff --git a/docker_templates/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2
index b45c5fac3..b45c5fac3 100644
--- a/docker_templates/ceilometer/ceilometer-central/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-central/Dockerfile.j2
diff --git a/docker_templates/ceilometer/ceilometer-central/config-external.sh b/docker/ceilometer/ceilometer-central/config-external.sh
index 2835bd5aa..2835bd5aa 100644
--- a/docker_templates/ceilometer/ceilometer-central/config-external.sh
+++ b/docker/ceilometer/ceilometer-central/config-external.sh
diff --git a/docker_templates/ceilometer/ceilometer-central/start.sh b/docker/ceilometer/ceilometer-central/start.sh
index f2980a4d5..f2980a4d5 100755
--- a/docker_templates/ceilometer/ceilometer-central/start.sh
+++ b/docker/ceilometer/ceilometer-central/start.sh
diff --git a/docker_templates/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2
index 6f425e855..6f425e855 100644
--- a/docker_templates/ceilometer/ceilometer-collector/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-collector/Dockerfile.j2
diff --git a/docker_templates/ceilometer/ceilometer-collector/config-external.sh b/docker/ceilometer/ceilometer-collector/config-external.sh
index 2835bd5aa..2835bd5aa 100644
--- a/docker_templates/ceilometer/ceilometer-collector/config-external.sh
+++ b/docker/ceilometer/ceilometer-collector/config-external.sh
diff --git a/docker_templates/ceilometer/ceilometer-collector/start.sh b/docker/ceilometer/ceilometer-collector/start.sh
index 3a59c17d1..3a59c17d1 100755
--- a/docker_templates/ceilometer/ceilometer-collector/start.sh
+++ b/docker/ceilometer/ceilometer-collector/start.sh
diff --git a/docker_templates/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2
index 0487af710..0487af710 100644
--- a/docker_templates/ceilometer/ceilometer-compute/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2
diff --git a/docker_templates/ceilometer/ceilometer-compute/config-external.sh b/docker/ceilometer/ceilometer-compute/config-external.sh
index 2835bd5aa..2835bd5aa 100644
--- a/docker_templates/ceilometer/ceilometer-compute/config-external.sh
+++ b/docker/ceilometer/ceilometer-compute/config-external.sh
diff --git a/docker_templates/ceilometer/ceilometer-compute/start.sh b/docker/ceilometer/ceilometer-compute/start.sh
index 19d90be2f..19d90be2f 100755
--- a/docker_templates/ceilometer/ceilometer-compute/start.sh
+++ b/docker/ceilometer/ceilometer-compute/start.sh
diff --git a/docker_templates/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2
index 67fcfb50e..67fcfb50e 100644
--- a/docker_templates/ceilometer/ceilometer-notification/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2
diff --git a/docker_templates/ceilometer/ceilometer-notification/config-external.sh b/docker/ceilometer/ceilometer-notification/config-external.sh
index 2835bd5aa..2835bd5aa 100644
--- a/docker_templates/ceilometer/ceilometer-notification/config-external.sh
+++ b/docker/ceilometer/ceilometer-notification/config-external.sh
diff --git a/docker_templates/ceilometer/ceilometer-notification/start.sh b/docker/ceilometer/ceilometer-notification/start.sh
index 8ce4b4488..8ce4b4488 100755
--- a/docker_templates/ceilometer/ceilometer-notification/start.sh
+++ b/docker/ceilometer/ceilometer-notification/start.sh
diff --git a/docker_templates/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2
index 196f93baf..196f93baf 100644
--- a/docker_templates/cinder/cinder-api/Dockerfile.j2
+++ b/docker/cinder/cinder-api/Dockerfile.j2
diff --git a/docker_templates/cinder/cinder-api/config-external.sh b/docker/cinder/cinder-api/config-external.sh
index 08d8cde0a..08d8cde0a 100644
--- a/docker_templates/cinder/cinder-api/config-external.sh
+++ b/docker/cinder/cinder-api/config-external.sh
diff --git a/docker_templates/cinder/cinder-api/start.sh b/docker/cinder/cinder-api/start.sh
index 6c61b3a4e..6c61b3a4e 100755
--- a/docker_templates/cinder/cinder-api/start.sh
+++ b/docker/cinder/cinder-api/start.sh
diff --git a/docker_templates/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2
index fa331b195..fa331b195 100644
--- a/docker_templates/cinder/cinder-backup/Dockerfile.j2
+++ b/docker/cinder/cinder-backup/Dockerfile.j2
diff --git a/docker_templates/cinder/cinder-backup/config-external.sh b/docker/cinder/cinder-backup/config-external.sh
index ff4752492..ff4752492 100644
--- a/docker_templates/cinder/cinder-backup/config-external.sh
+++ b/docker/cinder/cinder-backup/config-external.sh
diff --git a/docker_templates/cinder/cinder-backup/start.sh b/docker/cinder/cinder-backup/start.sh
index 7d9403f07..7d9403f07 100755
--- a/docker_templates/cinder/cinder-backup/start.sh
+++ b/docker/cinder/cinder-backup/start.sh
diff --git a/docker_templates/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index 1cce34a9e..1cce34a9e 100644
--- a/docker_templates/cinder/cinder-base/Dockerfile.j2
+++ b/docker/cinder/cinder-base/Dockerfile.j2
diff --git a/docker_templates/cinder/cinder-scheduler/Dockerfile.j2 b/docker/cinder/cinder-scheduler/Dockerfile.j2
index fa331b195..fa331b195 100644
--- a/docker_templates/cinder/cinder-scheduler/Dockerfile.j2
+++ b/docker/cinder/cinder-scheduler/Dockerfile.j2
diff --git a/docker_templates/cinder/cinder-scheduler/config-external.sh b/docker/cinder/cinder-scheduler/config-external.sh
index 3c8ca26be..3c8ca26be 100644
--- a/docker_templates/cinder/cinder-scheduler/config-external.sh
+++ b/docker/cinder/cinder-scheduler/config-external.sh
diff --git a/docker_templates/cinder/cinder-scheduler/start.sh b/docker/cinder/cinder-scheduler/start.sh
index 759175e3f..759175e3f 100755
--- a/docker_templates/cinder/cinder-scheduler/start.sh
+++ b/docker/cinder/cinder-scheduler/start.sh
diff --git a/docker_templates/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2
index 6393798bd..6393798bd 100644
--- a/docker_templates/cinder/cinder-volume/Dockerfile.j2
+++ b/docker/cinder/cinder-volume/Dockerfile.j2
diff --git a/docker_templates/cinder/cinder-volume/config-external.sh b/docker/cinder/cinder-volume/config-external.sh
index 2f6b99fc9..2f6b99fc9 100755
--- a/docker_templates/cinder/cinder-volume/config-external.sh
+++ b/docker/cinder/cinder-volume/config-external.sh
diff --git a/docker_templates/cinder/cinder-volume/start.sh b/docker/cinder/cinder-volume/start.sh
index a6874ce47..a6874ce47 100755
--- a/docker_templates/cinder/cinder-volume/start.sh
+++ b/docker/cinder/cinder-volume/start.sh
diff --git a/docker_templates/data/Dockerfile.j2 b/docker/data/Dockerfile.j2
index 7fecdb068..7fecdb068 100644
--- a/docker_templates/data/Dockerfile.j2
+++ b/docker/data/Dockerfile.j2
diff --git a/docker_templates/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2
index 75f4b06ee..75f4b06ee 100644
--- a/docker_templates/designate/designate-api/Dockerfile.j2
+++ b/docker/designate/designate-api/Dockerfile.j2
diff --git a/docker_templates/designate/designate-api/config-external.sh b/docker/designate/designate-api/config-external.sh
index ce302ea0c..ce302ea0c 100644
--- a/docker_templates/designate/designate-api/config-external.sh
+++ b/docker/designate/designate-api/config-external.sh
diff --git a/docker_templates/designate/designate-api/start.sh b/docker/designate/designate-api/start.sh
index fe556225b..fe556225b 100755
--- a/docker_templates/designate/designate-api/start.sh
+++ b/docker/designate/designate-api/start.sh
diff --git a/docker_templates/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2
index 06f86c043..06f86c043 100644
--- a/docker_templates/designate/designate-backend-bind9/Dockerfile.j2
+++ b/docker/designate/designate-backend-bind9/Dockerfile.j2
diff --git a/docker_templates/designate/designate-backend-bind9/config-external.sh b/docker/designate/designate-backend-bind9/config-external.sh
index ce302ea0c..ce302ea0c 100644
--- a/docker_templates/designate/designate-backend-bind9/config-external.sh
+++ b/docker/designate/designate-backend-bind9/config-external.sh
diff --git a/docker_templates/designate/designate-backend-bind9/start.sh b/docker/designate/designate-backend-bind9/start.sh
index 11922974a..11922974a 100755
--- a/docker_templates/designate/designate-backend-bind9/start.sh
+++ b/docker/designate/designate-backend-bind9/start.sh
diff --git a/docker_templates/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2
index 3fec3a6f7..3fec3a6f7 100644
--- a/docker_templates/designate/designate-base/Dockerfile.j2
+++ b/docker/designate/designate-base/Dockerfile.j2
diff --git a/docker_templates/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2
index 771ff3c68..771ff3c68 100644
--- a/docker_templates/designate/designate-central/Dockerfile.j2
+++ b/docker/designate/designate-central/Dockerfile.j2
diff --git a/docker_templates/designate/designate-central/config-external.sh b/docker/designate/designate-central/config-external.sh
index ce302ea0c..ce302ea0c 100644
--- a/docker_templates/designate/designate-central/config-external.sh
+++ b/docker/designate/designate-central/config-external.sh
diff --git a/docker_templates/designate/designate-central/start.sh b/docker/designate/designate-central/start.sh
index eac012d3d..eac012d3d 100755
--- a/docker_templates/designate/designate-central/start.sh
+++ b/docker/designate/designate-central/start.sh
diff --git a/docker_templates/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2
index cc5f5fb89..cc5f5fb89 100644
--- a/docker_templates/designate/designate-mdns/Dockerfile.j2
+++ b/docker/designate/designate-mdns/Dockerfile.j2
diff --git a/docker_templates/designate/designate-mdns/config-external.sh b/docker/designate/designate-mdns/config-external.sh
index ce302ea0c..ce302ea0c 100644
--- a/docker_templates/designate/designate-mdns/config-external.sh
+++ b/docker/designate/designate-mdns/config-external.sh
diff --git a/docker_templates/designate/designate-mdns/start.sh b/docker/designate/designate-mdns/start.sh
index b4bcda20c..b4bcda20c 100755
--- a/docker_templates/designate/designate-mdns/start.sh
+++ b/docker/designate/designate-mdns/start.sh
diff --git a/docker_templates/designate/designate-poolmanager/Dockerfile.j2 b/docker/designate/designate-poolmanager/Dockerfile.j2
index 0fc968b90..0fc968b90 100644
--- a/docker_templates/designate/designate-poolmanager/Dockerfile.j2
+++ b/docker/designate/designate-poolmanager/Dockerfile.j2
diff --git a/docker_templates/designate/designate-poolmanager/config-external.sh b/docker/designate/designate-poolmanager/config-external.sh
index ce302ea0c..ce302ea0c 100644
--- a/docker_templates/designate/designate-poolmanager/config-external.sh
+++ b/docker/designate/designate-poolmanager/config-external.sh
diff --git a/docker_templates/designate/designate-poolmanager/start.sh b/docker/designate/designate-poolmanager/start.sh
index 0752b9847..0752b9847 100755
--- a/docker_templates/designate/designate-poolmanager/start.sh
+++ b/docker/designate/designate-poolmanager/start.sh
diff --git a/docker_templates/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2
index c0ea23b2d..c0ea23b2d 100644
--- a/docker_templates/designate/designate-sink/Dockerfile.j2
+++ b/docker/designate/designate-sink/Dockerfile.j2
diff --git a/docker_templates/designate/designate-sink/config-external.sh b/docker/designate/designate-sink/config-external.sh
index ce302ea0c..ce302ea0c 100644
--- a/docker_templates/designate/designate-sink/config-external.sh
+++ b/docker/designate/designate-sink/config-external.sh
diff --git a/docker_templates/designate/designate-sink/start.sh b/docker/designate/designate-sink/start.sh
index d2f93e26f..d2f93e26f 100755
--- a/docker_templates/designate/designate-sink/start.sh
+++ b/docker/designate/designate-sink/start.sh
diff --git a/docker_templates/galera/Dockerfile.j2 b/docker/galera/Dockerfile.j2
index 38e66ee14..38e66ee14 100644
--- a/docker_templates/galera/Dockerfile.j2
+++ b/docker/galera/Dockerfile.j2
diff --git a/docker_templates/galera/config-external.sh b/docker/galera/config-external.sh
index 43447a51c..43447a51c 100644
--- a/docker_templates/galera/config-external.sh
+++ b/docker/galera/config-external.sh
diff --git a/docker_templates/galera/config-galera.sh b/docker/galera/config-galera.sh
index e66084001..e66084001 100755
--- a/docker_templates/galera/config-galera.sh
+++ b/docker/galera/config-galera.sh
diff --git a/docker_templates/galera/start.sh b/docker/galera/start.sh
index f8f8d7f77..f8f8d7f77 100755
--- a/docker_templates/galera/start.sh
+++ b/docker/galera/start.sh
diff --git a/docker_templates/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2
index e603a6c36..e603a6c36 100644
--- a/docker_templates/glance/glance-api/Dockerfile.j2
+++ b/docker/glance/glance-api/Dockerfile.j2
diff --git a/docker_templates/glance/glance-api/config-external.sh b/docker/glance/glance-api/config-external.sh
index ce5411738..ce5411738 100755
--- a/docker_templates/glance/glance-api/config-external.sh
+++ b/docker/glance/glance-api/config-external.sh
diff --git a/docker_templates/glance/glance-api/start.sh b/docker/glance/glance-api/start.sh
index ce3cb6d8b..ce3cb6d8b 100755
--- a/docker_templates/glance/glance-api/start.sh
+++ b/docker/glance/glance-api/start.sh
diff --git a/docker_templates/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2
index 8fad82106..8fad82106 100644
--- a/docker_templates/glance/glance-base/Dockerfile.j2
+++ b/docker/glance/glance-base/Dockerfile.j2
diff --git a/docker_templates/glance/glance-registry/Dockerfile.j2 b/docker/glance/glance-registry/Dockerfile.j2
index e603a6c36..e603a6c36 100644
--- a/docker_templates/glance/glance-registry/Dockerfile.j2
+++ b/docker/glance/glance-registry/Dockerfile.j2
diff --git a/docker_templates/glance/glance-registry/config-external.sh b/docker/glance/glance-registry/config-external.sh
index 37abd136d..37abd136d 100755
--- a/docker_templates/glance/glance-registry/config-external.sh
+++ b/docker/glance/glance-registry/config-external.sh
diff --git a/docker_templates/glance/glance-registry/start.sh b/docker/glance/glance-registry/start.sh
index 1d8265f80..1d8265f80 100755
--- a/docker_templates/glance/glance-registry/start.sh
+++ b/docker/glance/glance-registry/start.sh
diff --git a/docker_templates/gnocchi/gnocchi-api/Dockerfile.j2 b/docker/gnocchi/gnocchi-api/Dockerfile.j2
index 9ca70113c..9ca70113c 100644
--- a/docker_templates/gnocchi/gnocchi-api/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-api/Dockerfile.j2
diff --git a/docker_templates/gnocchi/gnocchi-api/config-external.sh b/docker/gnocchi/gnocchi-api/config-external.sh
index 59639ba63..59639ba63 100644
--- a/docker_templates/gnocchi/gnocchi-api/config-external.sh
+++ b/docker/gnocchi/gnocchi-api/config-external.sh
diff --git a/docker_templates/gnocchi/gnocchi-api/start.sh b/docker/gnocchi/gnocchi-api/start.sh
index 657368a27..657368a27 100755
--- a/docker_templates/gnocchi/gnocchi-api/start.sh
+++ b/docker/gnocchi/gnocchi-api/start.sh
diff --git a/docker_templates/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2
index be8840073..be8840073 100644
--- a/docker_templates/gnocchi/gnocchi-base/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2
diff --git a/docker_templates/gnocchi/gnocchi-statsd/Dockerfile.j2 b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2
index 99f1374a2..99f1374a2 100644
--- a/docker_templates/gnocchi/gnocchi-statsd/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2
diff --git a/docker_templates/gnocchi/gnocchi-statsd/config-external.sh b/docker/gnocchi/gnocchi-statsd/config-external.sh
index 59639ba63..59639ba63 100644
--- a/docker_templates/gnocchi/gnocchi-statsd/config-external.sh
+++ b/docker/gnocchi/gnocchi-statsd/config-external.sh
diff --git a/docker_templates/gnocchi/gnocchi-statsd/start.sh b/docker/gnocchi/gnocchi-statsd/start.sh
index 636e71323..636e71323 100755
--- a/docker_templates/gnocchi/gnocchi-statsd/start.sh
+++ b/docker/gnocchi/gnocchi-statsd/start.sh
diff --git a/docker_templates/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2
index 2858f436a..2858f436a 100755
--- a/docker_templates/haproxy/Dockerfile.j2
+++ b/docker/haproxy/Dockerfile.j2
diff --git a/docker_templates/haproxy/config-external.sh b/docker/haproxy/config-external.sh
index 0c41a5bdb..0c41a5bdb 100644
--- a/docker_templates/haproxy/config-external.sh
+++ b/docker/haproxy/config-external.sh
diff --git a/docker_templates/haproxy/ensure_latest_config.sh b/docker/haproxy/ensure_latest_config.sh
index b91189ca5..b91189ca5 100755
--- a/docker_templates/haproxy/ensure_latest_config.sh
+++ b/docker/haproxy/ensure_latest_config.sh
diff --git a/docker_templates/haproxy/start.sh b/docker/haproxy/start.sh
index d1da4a607..d1da4a607 100755
--- a/docker_templates/haproxy/start.sh
+++ b/docker/haproxy/start.sh
diff --git a/docker_templates/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2
index f199c16cf..f199c16cf 100644
--- a/docker_templates/heat/heat-api-cfn/Dockerfile.j2
+++ b/docker/heat/heat-api-cfn/Dockerfile.j2
diff --git a/docker_templates/heat/heat-api-cfn/config-external.sh b/docker/heat/heat-api-cfn/config-external.sh
index 91d5742f1..91d5742f1 100644
--- a/docker_templates/heat/heat-api-cfn/config-external.sh
+++ b/docker/heat/heat-api-cfn/config-external.sh
diff --git a/docker_templates/heat/heat-api-cfn/start.sh b/docker/heat/heat-api-cfn/start.sh
index 54b533185..54b533185 100755
--- a/docker_templates/heat/heat-api-cfn/start.sh
+++ b/docker/heat/heat-api-cfn/start.sh
diff --git a/docker_templates/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2
index 8a782d8d3..8a782d8d3 100644
--- a/docker_templates/heat/heat-api/Dockerfile.j2
+++ b/docker/heat/heat-api/Dockerfile.j2
diff --git a/docker_templates/heat/heat-api/config-external.sh b/docker/heat/heat-api/config-external.sh
index ca5d73e90..ca5d73e90 100644
--- a/docker_templates/heat/heat-api/config-external.sh
+++ b/docker/heat/heat-api/config-external.sh
diff --git a/docker_templates/heat/heat-api/start.sh b/docker/heat/heat-api/start.sh
index a7b14b1d9..a7b14b1d9 100755
--- a/docker_templates/heat/heat-api/start.sh
+++ b/docker/heat/heat-api/start.sh
diff --git a/docker_templates/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2
index 408167e90..408167e90 100644
--- a/docker_templates/heat/heat-base/Dockerfile.j2
+++ b/docker/heat/heat-base/Dockerfile.j2
diff --git a/docker_templates/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2
index 5002d519d..5002d519d 100644
--- a/docker_templates/heat/heat-engine/Dockerfile.j2
+++ b/docker/heat/heat-engine/Dockerfile.j2
diff --git a/docker_templates/heat/heat-engine/config-external.sh b/docker/heat/heat-engine/config-external.sh
index bde0ffe0d..bde0ffe0d 100644
--- a/docker_templates/heat/heat-engine/config-external.sh
+++ b/docker/heat/heat-engine/config-external.sh
diff --git a/docker_templates/heat/heat-engine/start.sh b/docker/heat/heat-engine/start.sh
index 8f9a6f1cb..8f9a6f1cb 100755
--- a/docker_templates/heat/heat-engine/start.sh
+++ b/docker/heat/heat-engine/start.sh
diff --git a/docker_templates/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
index 2fe69b3d2..2fe69b3d2 100644
--- a/docker_templates/horizon/Dockerfile.j2
+++ b/docker/horizon/Dockerfile.j2
diff --git a/docker_templates/horizon/config-external.sh b/docker/horizon/config-external.sh
index 8e9fc47a0..8e9fc47a0 100644
--- a/docker_templates/horizon/config-external.sh
+++ b/docker/horizon/config-external.sh
diff --git a/docker_templates/horizon/start.sh b/docker/horizon/start.sh
index 096326a3a..096326a3a 100755
--- a/docker_templates/horizon/start.sh
+++ b/docker/horizon/start.sh
diff --git a/docker_templates/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2
index 5bce3bdda..5bce3bdda 100644
--- a/docker_templates/ironic/ironic-api/Dockerfile.j2
+++ b/docker/ironic/ironic-api/Dockerfile.j2
diff --git a/docker_templates/ironic/ironic-api/config-external.sh b/docker/ironic/ironic-api/config-external.sh
index b838ee19d..b838ee19d 100644
--- a/docker_templates/ironic/ironic-api/config-external.sh
+++ b/docker/ironic/ironic-api/config-external.sh
diff --git a/docker_templates/ironic/ironic-api/start.sh b/docker/ironic/ironic-api/start.sh
index 9d449defb..9d449defb 100755
--- a/docker_templates/ironic/ironic-api/start.sh
+++ b/docker/ironic/ironic-api/start.sh
diff --git a/docker_templates/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2
index 0fc7e56c2..0fc7e56c2 100644
--- a/docker_templates/ironic/ironic-base/Dockerfile.j2
+++ b/docker/ironic/ironic-base/Dockerfile.j2
diff --git a/docker_templates/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index d38033230..d38033230 100644
--- a/docker_templates/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
diff --git a/docker_templates/ironic/ironic-conductor/config-external.sh b/docker/ironic/ironic-conductor/config-external.sh
index b838ee19d..b838ee19d 100644
--- a/docker_templates/ironic/ironic-conductor/config-external.sh
+++ b/docker/ironic/ironic-conductor/config-external.sh
diff --git a/docker_templates/ironic/ironic-conductor/start.sh b/docker/ironic/ironic-conductor/start.sh
index c766f04c5..c766f04c5 100755
--- a/docker_templates/ironic/ironic-conductor/start.sh
+++ b/docker/ironic/ironic-conductor/start.sh
diff --git a/docker_templates/ironic/ironic-discoverd/Dockerfile.j2 b/docker/ironic/ironic-discoverd/Dockerfile.j2
index cb4e8b80f..cb4e8b80f 100644
--- a/docker_templates/ironic/ironic-discoverd/Dockerfile.j2
+++ b/docker/ironic/ironic-discoverd/Dockerfile.j2
diff --git a/docker_templates/ironic/ironic-discoverd/config-external.sh b/docker/ironic/ironic-discoverd/config-external.sh
index a3f82b8f3..a3f82b8f3 100644
--- a/docker_templates/ironic/ironic-discoverd/config-external.sh
+++ b/docker/ironic/ironic-discoverd/config-external.sh
diff --git a/docker_templates/ironic/ironic-discoverd/start.sh b/docker/ironic/ironic-discoverd/start.sh
index 093dc517a..093dc517a 100755
--- a/docker_templates/ironic/ironic-discoverd/start.sh
+++ b/docker/ironic/ironic-discoverd/start.sh
diff --git a/docker_templates/keepalived/Dockerfile.j2 b/docker/keepalived/Dockerfile.j2
index 325e4c2c5..325e4c2c5 100644
--- a/docker_templates/keepalived/Dockerfile.j2
+++ b/docker/keepalived/Dockerfile.j2
diff --git a/docker_templates/keepalived/check_alive.sh b/docker/keepalived/check_alive.sh
index 8c2684f10..8c2684f10 100755
--- a/docker_templates/keepalived/check_alive.sh
+++ b/docker/keepalived/check_alive.sh
diff --git a/docker_templates/keepalived/config-external.sh b/docker/keepalived/config-external.sh
index d7ff97826..d7ff97826 100755
--- a/docker_templates/keepalived/config-external.sh
+++ b/docker/keepalived/config-external.sh
diff --git a/docker_templates/keepalived/start.sh b/docker/keepalived/start.sh
index a122526e4..a122526e4 100755
--- a/docker_templates/keepalived/start.sh
+++ b/docker/keepalived/start.sh
diff --git a/docker_templates/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2
index a3b686165..a3b686165 100644
--- a/docker_templates/keystone/Dockerfile.j2
+++ b/docker/keystone/Dockerfile.j2
diff --git a/docker_templates/keystone/config-external.sh b/docker/keystone/config-external.sh
index 1bd4e3bb4..1bd4e3bb4 100644
--- a/docker_templates/keystone/config-external.sh
+++ b/docker/keystone/config-external.sh
diff --git a/docker_templates/keystone/start.sh b/docker/keystone/start.sh
index d964b0303..d964b0303 100755
--- a/docker_templates/keystone/start.sh
+++ b/docker/keystone/start.sh
diff --git a/docker_templates/kolla-ansible/Dockerfile.j2 b/docker/kolla-ansible/Dockerfile.j2
index 9975f5873..9975f5873 100644
--- a/docker_templates/kolla-ansible/Dockerfile.j2
+++ b/docker/kolla-ansible/Dockerfile.j2
diff --git a/docker_templates/kolla-ansible/kolla_keystone_service.py b/docker/kolla-ansible/kolla_keystone_service.py
index 455aaf578..455aaf578 100644
--- a/docker_templates/kolla-ansible/kolla_keystone_service.py
+++ b/docker/kolla-ansible/kolla_keystone_service.py
diff --git a/docker_templates/kolla-ansible/kolla_keystone_user.py b/docker/kolla-ansible/kolla_keystone_user.py
index 5d295c1e2..5d295c1e2 100644
--- a/docker_templates/kolla-ansible/kolla_keystone_user.py
+++ b/docker/kolla-ansible/kolla_keystone_user.py
diff --git a/docker_templates/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2
index e208a115e..e208a115e 100644
--- a/docker_templates/magnum/magnum-api/Dockerfile.j2
+++ b/docker/magnum/magnum-api/Dockerfile.j2
diff --git a/docker_templates/magnum/magnum-api/config-external.sh b/docker/magnum/magnum-api/config-external.sh
index 573043f7d..573043f7d 100644
--- a/docker_templates/magnum/magnum-api/config-external.sh
+++ b/docker/magnum/magnum-api/config-external.sh
diff --git a/docker_templates/magnum/magnum-api/start.sh b/docker/magnum/magnum-api/start.sh
index ed154e29a..ed154e29a 100755
--- a/docker_templates/magnum/magnum-api/start.sh
+++ b/docker/magnum/magnum-api/start.sh
diff --git a/docker_templates/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2
index 59c22f57e..59c22f57e 100644
--- a/docker_templates/magnum/magnum-base/Dockerfile.j2
+++ b/docker/magnum/magnum-base/Dockerfile.j2
diff --git a/docker_templates/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2
index c14370085..c14370085 100644
--- a/docker_templates/magnum/magnum-conductor/Dockerfile.j2
+++ b/docker/magnum/magnum-conductor/Dockerfile.j2
diff --git a/docker_templates/magnum/magnum-conductor/config-external.sh b/docker/magnum/magnum-conductor/config-external.sh
index b96e3179e..b96e3179e 100644
--- a/docker_templates/magnum/magnum-conductor/config-external.sh
+++ b/docker/magnum/magnum-conductor/config-external.sh
diff --git a/docker_templates/magnum/magnum-conductor/start.sh b/docker/magnum/magnum-conductor/start.sh
index a5c76ee85..a5c76ee85 100755
--- a/docker_templates/magnum/magnum-conductor/start.sh
+++ b/docker/magnum/magnum-conductor/start.sh
diff --git a/docker_templates/memcached/Dockerfile.j2 b/docker/memcached/Dockerfile.j2
index 0c0111f7e..0c0111f7e 100644
--- a/docker_templates/memcached/Dockerfile.j2
+++ b/docker/memcached/Dockerfile.j2
diff --git a/docker_templates/memcached/config-external.sh b/docker/memcached/config-external.sh
index 0f3fa8336..0f3fa8336 100644
--- a/docker_templates/memcached/config-external.sh
+++ b/docker/memcached/config-external.sh
diff --git a/docker_templates/memcached/start.sh b/docker/memcached/start.sh
index 531dd3872..531dd3872 100755
--- a/docker_templates/memcached/start.sh
+++ b/docker/memcached/start.sh
diff --git a/docker_templates/mongodb/Dockerfile.j2 b/docker/mongodb/Dockerfile.j2
index ee82f0b7a..ee82f0b7a 100644
--- a/docker_templates/mongodb/Dockerfile.j2
+++ b/docker/mongodb/Dockerfile.j2
diff --git a/docker_templates/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2
index f1d7e1f42..f1d7e1f42 100644
--- a/docker_templates/murano/murano-api/Dockerfile.j2
+++ b/docker/murano/murano-api/Dockerfile.j2
diff --git a/docker_templates/murano/murano-api/config-external.sh b/docker/murano/murano-api/config-external.sh
index 5d9a2da49..5d9a2da49 100644
--- a/docker_templates/murano/murano-api/config-external.sh
+++ b/docker/murano/murano-api/config-external.sh
diff --git a/docker_templates/murano/murano-api/start.sh b/docker/murano/murano-api/start.sh
index 7d712177d..7d712177d 100755
--- a/docker_templates/murano/murano-api/start.sh
+++ b/docker/murano/murano-api/start.sh
diff --git a/docker_templates/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2
index cb700e5e0..cb700e5e0 100644
--- a/docker_templates/murano/murano-base/Dockerfile.j2
+++ b/docker/murano/murano-base/Dockerfile.j2
diff --git a/docker_templates/murano/murano-engine/Dockerfile.j2 b/docker/murano/murano-engine/Dockerfile.j2
index f1d7e1f42..f1d7e1f42 100644
--- a/docker_templates/murano/murano-engine/Dockerfile.j2
+++ b/docker/murano/murano-engine/Dockerfile.j2
diff --git a/docker_templates/murano/murano-engine/config-external.sh b/docker/murano/murano-engine/config-external.sh
index 5d9a2da49..5d9a2da49 100644
--- a/docker_templates/murano/murano-engine/config-external.sh
+++ b/docker/murano/murano-engine/config-external.sh
diff --git a/docker_templates/murano/murano-engine/start.sh b/docker/murano/murano-engine/start.sh
index 22834fc4c..22834fc4c 100755
--- a/docker_templates/murano/murano-engine/start.sh
+++ b/docker/murano/murano-engine/start.sh
diff --git a/docker_templates/neutron/neutron-agents/Dockerfile.j2 b/docker/neutron/neutron-agents/Dockerfile.j2
index 590443e00..590443e00 100644
--- a/docker_templates/neutron/neutron-agents/Dockerfile.j2
+++ b/docker/neutron/neutron-agents/Dockerfile.j2
diff --git a/docker_templates/neutron/neutron-agents/fwaas_driver.ini b/docker/neutron/neutron-agents/fwaas_driver.ini
index a9b1ec519..a9b1ec519 120000
--- a/docker_templates/neutron/neutron-agents/fwaas_driver.ini
+++ b/docker/neutron/neutron-agents/fwaas_driver.ini
diff --git a/docker_templates/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh b/docker/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh
index badbd86a1..badbd86a1 100755
--- a/docker_templates/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh
+++ b/docker/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh
diff --git a/docker_templates/neutron/neutron-agents/neutron-dhcp-agent/start.sh b/docker/neutron/neutron-agents/neutron-dhcp-agent/start.sh
index 7b64f87aa..7b64f87aa 100755
--- a/docker_templates/neutron/neutron-agents/neutron-dhcp-agent/start.sh
+++ b/docker/neutron/neutron-agents/neutron-dhcp-agent/start.sh
diff --git a/docker_templates/neutron/neutron-agents/neutron-l3-agent/config-external.sh b/docker/neutron/neutron-agents/neutron-l3-agent/config-external.sh
index e6eb049a4..e6eb049a4 100755
--- a/docker_templates/neutron/neutron-agents/neutron-l3-agent/config-external.sh
+++ b/docker/neutron/neutron-agents/neutron-l3-agent/config-external.sh
diff --git a/docker_templates/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini b/docker/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini
index 41f761abf..41f761abf 100644
--- a/docker_templates/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini
+++ b/docker/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini
diff --git a/docker_templates/neutron/neutron-agents/neutron-l3-agent/start.sh b/docker/neutron/neutron-agents/neutron-l3-agent/start.sh
index e0a17e47a..e0a17e47a 100755
--- a/docker_templates/neutron/neutron-agents/neutron-l3-agent/start.sh
+++ b/docker/neutron/neutron-agents/neutron-l3-agent/start.sh
diff --git a/docker_templates/neutron/neutron-agents/neutron-metadata-agent/config-external.sh b/docker/neutron/neutron-agents/neutron-metadata-agent/config-external.sh
index 319ee3793..319ee3793 100755
--- a/docker_templates/neutron/neutron-agents/neutron-metadata-agent/config-external.sh
+++ b/docker/neutron/neutron-agents/neutron-metadata-agent/config-external.sh
diff --git a/docker_templates/neutron/neutron-agents/neutron-metadata-agent/start.sh b/docker/neutron/neutron-agents/neutron-metadata-agent/start.sh
index 09a7329c7..09a7329c7 100755
--- a/docker_templates/neutron/neutron-agents/neutron-metadata-agent/start.sh
+++ b/docker/neutron/neutron-agents/neutron-metadata-agent/start.sh
diff --git a/docker_templates/neutron/neutron-agents/supervisord.conf b/docker/neutron/neutron-agents/supervisord.conf
index 5cab8f5dc..5cab8f5dc 100644
--- a/docker_templates/neutron/neutron-agents/supervisord.conf
+++ b/docker/neutron/neutron-agents/supervisord.conf
diff --git a/docker_templates/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index f1cd75a37..f1cd75a37 100644
--- a/docker_templates/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
diff --git a/docker_templates/neutron/neutron-base/config-sudoers.sh b/docker/neutron/neutron-base/config-sudoers.sh
index 82cf0d624..82cf0d624 100644
--- a/docker_templates/neutron/neutron-base/config-sudoers.sh
+++ b/docker/neutron/neutron-base/config-sudoers.sh
diff --git a/docker_templates/neutron/neutron-base/ip_wrapper.py b/docker/neutron/neutron-base/ip_wrapper.py
index 591fca6f4..591fca6f4 100755
--- a/docker_templates/neutron/neutron-base/ip_wrapper.py
+++ b/docker/neutron/neutron-base/ip_wrapper.py
diff --git a/docker_templates/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
index 58d5ae6c3..58d5ae6c3 100644
--- a/docker_templates/neutron/neutron-linuxbridge-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
diff --git a/docker_templates/neutron/neutron-linuxbridge-agent/config-external.sh b/docker/neutron/neutron-linuxbridge-agent/config-external.sh
index c44d71d84..c44d71d84 100755
--- a/docker_templates/neutron/neutron-linuxbridge-agent/config-external.sh
+++ b/docker/neutron/neutron-linuxbridge-agent/config-external.sh
diff --git a/docker_templates/neutron/neutron-linuxbridge-agent/start.sh b/docker/neutron/neutron-linuxbridge-agent/start.sh
index ab47f2dfb..ab47f2dfb 100755
--- a/docker_templates/neutron/neutron-linuxbridge-agent/start.sh
+++ b/docker/neutron/neutron-linuxbridge-agent/start.sh
diff --git a/docker_templates/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
index ad12e5511..ad12e5511 100644
--- a/docker_templates/neutron/neutron-openvswitch-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
diff --git a/docker_templates/neutron/neutron-openvswitch-agent/config-external.sh b/docker/neutron/neutron-openvswitch-agent/config-external.sh
index 552d69861..552d69861 100755
--- a/docker_templates/neutron/neutron-openvswitch-agent/config-external.sh
+++ b/docker/neutron/neutron-openvswitch-agent/config-external.sh
diff --git a/docker_templates/neutron/neutron-openvswitch-agent/start.sh b/docker/neutron/neutron-openvswitch-agent/start.sh
index 6d62ff65d..6d62ff65d 100755
--- a/docker_templates/neutron/neutron-openvswitch-agent/start.sh
+++ b/docker/neutron/neutron-openvswitch-agent/start.sh
diff --git a/docker_templates/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2
index 9cfe634c4..9cfe634c4 100644
--- a/docker_templates/neutron/neutron-server/Dockerfile.j2
+++ b/docker/neutron/neutron-server/Dockerfile.j2
diff --git a/docker_templates/neutron/neutron-server/config-external.sh b/docker/neutron/neutron-server/config-external.sh
index 574923067..574923067 100755
--- a/docker_templates/neutron/neutron-server/config-external.sh
+++ b/docker/neutron/neutron-server/config-external.sh
diff --git a/docker_templates/neutron/neutron-server/start.sh b/docker/neutron/neutron-server/start.sh
index 51c4c2a3d..51c4c2a3d 100755
--- a/docker_templates/neutron/neutron-server/start.sh
+++ b/docker/neutron/neutron-server/start.sh
diff --git a/docker_templates/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2
index b906d1937..b906d1937 100644
--- a/docker_templates/nova/nova-api/Dockerfile.j2
+++ b/docker/nova/nova-api/Dockerfile.j2
diff --git a/docker_templates/nova/nova-api/config-external.sh b/docker/nova/nova-api/config-external.sh
index d0859893d..d0859893d 100755
--- a/docker_templates/nova/nova-api/config-external.sh
+++ b/docker/nova/nova-api/config-external.sh
diff --git a/docker_templates/nova/nova-api/start.sh b/docker/nova/nova-api/start.sh
index ad25ba65c..ad25ba65c 100755
--- a/docker_templates/nova/nova-api/start.sh
+++ b/docker/nova/nova-api/start.sh
diff --git a/docker_templates/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2
index b46a446d4..b46a446d4 100644
--- a/docker_templates/nova/nova-base/Dockerfile.j2
+++ b/docker/nova/nova-base/Dockerfile.j2
diff --git a/docker_templates/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index a8a719023..a8a719023 100644
--- a/docker_templates/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
diff --git a/docker_templates/nova/nova-compute/config-external.sh b/docker/nova/nova-compute/config-external.sh
index e844bf50c..e844bf50c 100755
--- a/docker_templates/nova/nova-compute/config-external.sh
+++ b/docker/nova/nova-compute/config-external.sh
diff --git a/docker_templates/nova/nova-compute/start.sh b/docker/nova/nova-compute/start.sh
index 48e77542b..48e77542b 100755
--- a/docker_templates/nova/nova-compute/start.sh
+++ b/docker/nova/nova-compute/start.sh
diff --git a/docker_templates/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2
index 0f42df5c9..0f42df5c9 100644
--- a/docker_templates/nova/nova-conductor/Dockerfile.j2
+++ b/docker/nova/nova-conductor/Dockerfile.j2
diff --git a/docker_templates/nova/nova-conductor/config-external.sh b/docker/nova/nova-conductor/config-external.sh
index ea3b123ec..ea3b123ec 100755
--- a/docker_templates/nova/nova-conductor/config-external.sh
+++ b/docker/nova/nova-conductor/config-external.sh
diff --git a/docker_templates/nova/nova-conductor/start.sh b/docker/nova/nova-conductor/start.sh
index 1fe7d0586..1fe7d0586 100755
--- a/docker_templates/nova/nova-conductor/start.sh
+++ b/docker/nova/nova-conductor/start.sh
diff --git a/docker_templates/nova/nova-consoleauth/Dockerfile.j2 b/docker/nova/nova-consoleauth/Dockerfile.j2
index 1c8d9ea12..1c8d9ea12 100644
--- a/docker_templates/nova/nova-consoleauth/Dockerfile.j2
+++ b/docker/nova/nova-consoleauth/Dockerfile.j2
diff --git a/docker_templates/nova/nova-consoleauth/config-external.sh b/docker/nova/nova-consoleauth/config-external.sh
index 1da10d83f..1da10d83f 100755
--- a/docker_templates/nova/nova-consoleauth/config-external.sh
+++ b/docker/nova/nova-consoleauth/config-external.sh
diff --git a/docker_templates/nova/nova-consoleauth/start.sh b/docker/nova/nova-consoleauth/start.sh
index 1abccde19..1abccde19 100755
--- a/docker_templates/nova/nova-consoleauth/start.sh
+++ b/docker/nova/nova-consoleauth/start.sh
diff --git a/docker_templates/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index 5ff525426..5ff525426 100644
--- a/docker_templates/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/Dockerfile.j2
diff --git a/docker_templates/nova/nova-libvirt/config-external.sh b/docker/nova/nova-libvirt/config-external.sh
index acc1c5473..acc1c5473 100755
--- a/docker_templates/nova/nova-libvirt/config-external.sh
+++ b/docker/nova/nova-libvirt/config-external.sh
diff --git a/docker_templates/nova/nova-libvirt/start.sh b/docker/nova/nova-libvirt/start.sh
index ae0de867b..ae0de867b 100755
--- a/docker_templates/nova/nova-libvirt/start.sh
+++ b/docker/nova/nova-libvirt/start.sh
diff --git a/docker_templates/nova/nova-network/Dockerfile.j2 b/docker/nova/nova-network/Dockerfile.j2
index 60ea394aa..60ea394aa 100644
--- a/docker_templates/nova/nova-network/Dockerfile.j2
+++ b/docker/nova/nova-network/Dockerfile.j2
diff --git a/docker_templates/nova/nova-network/config-external.sh b/docker/nova/nova-network/config-external.sh
index 7c1d6bb37..7c1d6bb37 100755
--- a/docker_templates/nova/nova-network/config-external.sh
+++ b/docker/nova/nova-network/config-external.sh
diff --git a/docker_templates/nova/nova-network/start.sh b/docker/nova/nova-network/start.sh
index 88f941b33..88f941b33 100755
--- a/docker_templates/nova/nova-network/start.sh
+++ b/docker/nova/nova-network/start.sh
diff --git a/docker_templates/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2
index b798e00a6..b798e00a6 100644
--- a/docker_templates/nova/nova-novncproxy/Dockerfile.j2
+++ b/docker/nova/nova-novncproxy/Dockerfile.j2
diff --git a/docker_templates/nova/nova-novncproxy/config-external.sh b/docker/nova/nova-novncproxy/config-external.sh
index fdc33a5bd..fdc33a5bd 100755
--- a/docker_templates/nova/nova-novncproxy/config-external.sh
+++ b/docker/nova/nova-novncproxy/config-external.sh
diff --git a/docker_templates/nova/nova-novncproxy/start.sh b/docker/nova/nova-novncproxy/start.sh
index 6e59d1253..6e59d1253 100755
--- a/docker_templates/nova/nova-novncproxy/start.sh
+++ b/docker/nova/nova-novncproxy/start.sh
diff --git a/docker_templates/nova/nova-scheduler/Dockerfile.j2 b/docker/nova/nova-scheduler/Dockerfile.j2
index 5dd0fd507..5dd0fd507 100644
--- a/docker_templates/nova/nova-scheduler/Dockerfile.j2
+++ b/docker/nova/nova-scheduler/Dockerfile.j2
diff --git a/docker_templates/nova/nova-scheduler/config-external.sh b/docker/nova/nova-scheduler/config-external.sh
index 3df0f9b7b..3df0f9b7b 100755
--- a/docker_templates/nova/nova-scheduler/config-external.sh
+++ b/docker/nova/nova-scheduler/config-external.sh
diff --git a/docker_templates/nova/nova-scheduler/start.sh b/docker/nova/nova-scheduler/start.sh
index d9b3e14eb..d9b3e14eb 100755
--- a/docker_templates/nova/nova-scheduler/start.sh
+++ b/docker/nova/nova-scheduler/start.sh
diff --git a/docker_templates/openvswitch/ovs-base/Dockerfile.j2 b/docker/openvswitch/ovs-base/Dockerfile.j2
index fd8eac1af..fd8eac1af 100644
--- a/docker_templates/openvswitch/ovs-base/Dockerfile.j2
+++ b/docker/openvswitch/ovs-base/Dockerfile.j2
diff --git a/docker_templates/openvswitch/ovs-db-server/Dockerfile.j2 b/docker/openvswitch/ovs-db-server/Dockerfile.j2
index 05c6a928b..05c6a928b 100644
--- a/docker_templates/openvswitch/ovs-db-server/Dockerfile.j2
+++ b/docker/openvswitch/ovs-db-server/Dockerfile.j2
diff --git a/docker_templates/openvswitch/ovs-db-server/config-external.sh b/docker/openvswitch/ovs-db-server/config-external.sh
index 9ada4efcb..9ada4efcb 100644
--- a/docker_templates/openvswitch/ovs-db-server/config-external.sh
+++ b/docker/openvswitch/ovs-db-server/config-external.sh
diff --git a/docker_templates/openvswitch/ovs-db-server/start.sh b/docker/openvswitch/ovs-db-server/start.sh
index 89b2e3e92..89b2e3e92 100755
--- a/docker_templates/openvswitch/ovs-db-server/start.sh
+++ b/docker/openvswitch/ovs-db-server/start.sh
diff --git a/docker_templates/openvswitch/ovs-vswitchd/Dockerfile.j2 b/docker/openvswitch/ovs-vswitchd/Dockerfile.j2
index 59079d335..59079d335 100644
--- a/docker_templates/openvswitch/ovs-vswitchd/Dockerfile.j2
+++ b/docker/openvswitch/ovs-vswitchd/Dockerfile.j2
diff --git a/docker_templates/openvswitch/ovs-vswitchd/config-external.sh b/docker/openvswitch/ovs-vswitchd/config-external.sh
index 9ada4efcb..9ada4efcb 100644
--- a/docker_templates/openvswitch/ovs-vswitchd/config-external.sh
+++ b/docker/openvswitch/ovs-vswitchd/config-external.sh
diff --git a/docker_templates/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh b/docker/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh
index c39d64ff7..c39d64ff7 100755
--- a/docker_templates/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh
+++ b/docker/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh
diff --git a/docker_templates/openvswitch/ovs-vswitchd/start.sh b/docker/openvswitch/ovs-vswitchd/start.sh
index 3ec2c26b2..3ec2c26b2 100755
--- a/docker_templates/openvswitch/ovs-vswitchd/start.sh
+++ b/docker/openvswitch/ovs-vswitchd/start.sh
diff --git a/docker_templates/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2
index 1baf2ce80..1baf2ce80 100644
--- a/docker_templates/rabbitmq/Dockerfile.j2
+++ b/docker/rabbitmq/Dockerfile.j2
diff --git a/docker_templates/rabbitmq/config-external.sh b/docker/rabbitmq/config-external.sh
index 33810d621..33810d621 100644
--- a/docker_templates/rabbitmq/config-external.sh
+++ b/docker/rabbitmq/config-external.sh
diff --git a/docker_templates/rabbitmq/config-rabbit.sh b/docker/rabbitmq/config-rabbit.sh
index c87a2ab48..c87a2ab48 100644
--- a/docker_templates/rabbitmq/config-rabbit.sh
+++ b/docker/rabbitmq/config-rabbit.sh
diff --git a/docker_templates/rabbitmq/start.sh b/docker/rabbitmq/start.sh
index 749bee963..749bee963 100755
--- a/docker_templates/rabbitmq/start.sh
+++ b/docker/rabbitmq/start.sh
diff --git a/docker_templates/swift/swift-account-server/Dockerfile.j2 b/docker/swift/swift-account-server/Dockerfile.j2
index 7320de9f4..7320de9f4 100644
--- a/docker_templates/swift/swift-account-server/Dockerfile.j2
+++ b/docker/swift/swift-account-server/Dockerfile.j2
diff --git a/docker_templates/swift/swift-account-server/config-external.sh b/docker/swift/swift-account-server/config-external.sh
index 61adefcd0..61adefcd0 100644
--- a/docker_templates/swift/swift-account-server/config-external.sh
+++ b/docker/swift/swift-account-server/config-external.sh
diff --git a/docker_templates/swift/swift-account-server/start.sh b/docker/swift/swift-account-server/start.sh
index 402ee6f44..402ee6f44 100755
--- a/docker_templates/swift/swift-account-server/start.sh
+++ b/docker/swift/swift-account-server/start.sh
diff --git a/docker_templates/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2
index 7102916f1..7102916f1 100644
--- a/docker_templates/swift/swift-base/Dockerfile.j2
+++ b/docker/swift/swift-base/Dockerfile.j2
diff --git a/docker_templates/swift/swift-base/build-swift-ring.py b/docker/swift/swift-base/build-swift-ring.py
index d7386392d..d7386392d 100644
--- a/docker_templates/swift/swift-base/build-swift-ring.py
+++ b/docker/swift/swift-base/build-swift-ring.py
diff --git a/docker_templates/swift/swift-base/config-swift.sh b/docker/swift/swift-base/config-swift.sh
index b101b4e69..b101b4e69 100755
--- a/docker_templates/swift/swift-base/config-swift.sh
+++ b/docker/swift/swift-base/config-swift.sh
diff --git a/docker_templates/swift/swift-container-server/Dockerfile.j2 b/docker/swift/swift-container-server/Dockerfile.j2
index 1a08c0f5d..1a08c0f5d 100644
--- a/docker_templates/swift/swift-container-server/Dockerfile.j2
+++ b/docker/swift/swift-container-server/Dockerfile.j2
diff --git a/docker_templates/swift/swift-container-server/config-external.sh b/docker/swift/swift-container-server/config-external.sh
index d81ba6cc4..d81ba6cc4 100644
--- a/docker_templates/swift/swift-container-server/config-external.sh
+++ b/docker/swift/swift-container-server/config-external.sh
diff --git a/docker_templates/swift/swift-container-server/start.sh b/docker/swift/swift-container-server/start.sh
index 78070ab29..78070ab29 100755
--- a/docker_templates/swift/swift-container-server/start.sh
+++ b/docker/swift/swift-container-server/start.sh
diff --git a/docker_templates/swift/swift-object-auditor/Dockerfile.j2 b/docker/swift/swift-object-auditor/Dockerfile.j2
index ab8a7adee..ab8a7adee 100644
--- a/docker_templates/swift/swift-object-auditor/Dockerfile.j2
+++ b/docker/swift/swift-object-auditor/Dockerfile.j2
diff --git a/docker_templates/swift/swift-object-auditor/config-external.sh b/docker/swift/swift-object-auditor/config-external.sh
index 0fa02e985..0fa02e985 100644
--- a/docker_templates/swift/swift-object-auditor/config-external.sh
+++ b/docker/swift/swift-object-auditor/config-external.sh
diff --git a/docker_templates/swift/swift-object-auditor/start.sh b/docker/swift/swift-object-auditor/start.sh
index 6319eed6b..6319eed6b 100755
--- a/docker_templates/swift/swift-object-auditor/start.sh
+++ b/docker/swift/swift-object-auditor/start.sh
diff --git a/docker_templates/swift/swift-object-base/Dockerfile.j2 b/docker/swift/swift-object-base/Dockerfile.j2
index 54997a114..54997a114 100644
--- a/docker_templates/swift/swift-object-base/Dockerfile.j2
+++ b/docker/swift/swift-object-base/Dockerfile.j2
diff --git a/docker_templates/swift/swift-object-base/config-swift-object.sh b/docker/swift/swift-object-base/config-swift-object.sh
index 0d3d58dc3..0d3d58dc3 100644
--- a/docker_templates/swift/swift-object-base/config-swift-object.sh
+++ b/docker/swift/swift-object-base/config-swift-object.sh
diff --git a/docker_templates/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2
index af9f3eb58..af9f3eb58 100644
--- a/docker_templates/swift/swift-object-expirer/Dockerfile.j2
+++ b/docker/swift/swift-object-expirer/Dockerfile.j2
diff --git a/docker_templates/swift/swift-object-expirer/config-external.sh b/docker/swift/swift-object-expirer/config-external.sh
index ff2bcf9f5..ff2bcf9f5 100644
--- a/docker_templates/swift/swift-object-expirer/config-external.sh
+++ b/docker/swift/swift-object-expirer/config-external.sh
diff --git a/docker_templates/swift/swift-object-expirer/start.sh b/docker/swift/swift-object-expirer/start.sh
index 434e8dc49..434e8dc49 100755
--- a/docker_templates/swift/swift-object-expirer/start.sh
+++ b/docker/swift/swift-object-expirer/start.sh
diff --git a/docker_templates/swift/swift-object-replicator/Dockerfile.j2 b/docker/swift/swift-object-replicator/Dockerfile.j2
index ab8a7adee..ab8a7adee 100644
--- a/docker_templates/swift/swift-object-replicator/Dockerfile.j2
+++ b/docker/swift/swift-object-replicator/Dockerfile.j2
diff --git a/docker_templates/swift/swift-object-replicator/config-external.sh b/docker/swift/swift-object-replicator/config-external.sh
index 0fa02e985..0fa02e985 100644
--- a/docker_templates/swift/swift-object-replicator/config-external.sh
+++ b/docker/swift/swift-object-replicator/config-external.sh
diff --git a/docker_templates/swift/swift-object-replicator/start.sh b/docker/swift/swift-object-replicator/start.sh
index 203f8864d..203f8864d 100755
--- a/docker_templates/swift/swift-object-replicator/start.sh
+++ b/docker/swift/swift-object-replicator/start.sh
diff --git a/docker_templates/swift/swift-object-server/Dockerfile.j2 b/docker/swift/swift-object-server/Dockerfile.j2
index ab8a7adee..ab8a7adee 100644
--- a/docker_templates/swift/swift-object-server/Dockerfile.j2
+++ b/docker/swift/swift-object-server/Dockerfile.j2
diff --git a/docker_templates/swift/swift-object-server/config-external.sh b/docker/swift/swift-object-server/config-external.sh
index a3fb1a2cc..a3fb1a2cc 100644
--- a/docker_templates/swift/swift-object-server/config-external.sh
+++ b/docker/swift/swift-object-server/config-external.sh
diff --git a/docker_templates/swift/swift-object-server/start.sh b/docker/swift/swift-object-server/start.sh
index f2a32b4d3..f2a32b4d3 100755
--- a/docker_templates/swift/swift-object-server/start.sh
+++ b/docker/swift/swift-object-server/start.sh
diff --git a/docker_templates/swift/swift-object-updater/Dockerfile.j2 b/docker/swift/swift-object-updater/Dockerfile.j2
index ab8a7adee..ab8a7adee 100644
--- a/docker_templates/swift/swift-object-updater/Dockerfile.j2
+++ b/docker/swift/swift-object-updater/Dockerfile.j2
diff --git a/docker_templates/swift/swift-object-updater/config-external.sh b/docker/swift/swift-object-updater/config-external.sh
index 0fa02e985..0fa02e985 100644
--- a/docker_templates/swift/swift-object-updater/config-external.sh
+++ b/docker/swift/swift-object-updater/config-external.sh
diff --git a/docker_templates/swift/swift-object-updater/start.sh b/docker/swift/swift-object-updater/start.sh
index 744344f74..744344f74 100755
--- a/docker_templates/swift/swift-object-updater/start.sh
+++ b/docker/swift/swift-object-updater/start.sh
diff --git a/docker_templates/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2
index 54d024f8b..54d024f8b 100644
--- a/docker_templates/swift/swift-proxy-server/Dockerfile.j2
+++ b/docker/swift/swift-proxy-server/Dockerfile.j2
diff --git a/docker_templates/swift/swift-proxy-server/config-external.sh b/docker/swift/swift-proxy-server/config-external.sh
index 434cce7e5..434cce7e5 100755
--- a/docker_templates/swift/swift-proxy-server/config-external.sh
+++ b/docker/swift/swift-proxy-server/config-external.sh
diff --git a/docker_templates/swift/swift-proxy-server/start.sh b/docker/swift/swift-proxy-server/start.sh
index 99a142e52..99a142e52 100755
--- a/docker_templates/swift/swift-proxy-server/start.sh
+++ b/docker/swift/swift-proxy-server/start.sh
diff --git a/docker_templates/zaqar/Dockerfile.j2 b/docker/zaqar/Dockerfile.j2
index 4e3a0bc52..4e3a0bc52 100644
--- a/docker_templates/zaqar/Dockerfile.j2
+++ b/docker/zaqar/Dockerfile.j2
diff --git a/docker_templates/zaqar/config-external.sh b/docker/zaqar/config-external.sh
index 7ed6da2eb..7ed6da2eb 100644
--- a/docker_templates/zaqar/config-external.sh
+++ b/docker/zaqar/config-external.sh
diff --git a/docker_templates/zaqar/start.sh b/docker/zaqar/start.sh
index fa1050280..fa1050280 100755
--- a/docker_templates/zaqar/start.sh
+++ b/docker/zaqar/start.sh
diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py
index d3842d581..ed1de0035 100755
--- a/kolla/cmd/build.py
+++ b/kolla/cmd/build.py
@@ -239,9 +239,9 @@ def arg_parser():
                         type=int,
                         default=3)
     parser.add_argument('--template',
-                        help='Create dockerfiles from templates',
+                        help='DEPRECATED: All Dockerfiles are templates',
                         action='store_true',
-                        default=False)
+                        default=True)
     parser.add_argument('-d', '--debug',
                         help='Turn on debugging log level',
                         action='store_true')
@@ -274,9 +274,7 @@ class KollaWorker(object):
         self.base_dir = os.path.abspath(find_base_dir())
         LOG.debug("Kolla base directory: " + self.base_dir)
         self.images_dir = os.path.join(self.base_dir, 'docker')
-        self.templates_dir = os.path.join(self.base_dir, 'docker_templates')
         self.namespace = args['namespace']
-        self.template = args['template']
         self.base = args['base']
         self.base_tag = args['base_tag']
         self.type_ = args['type']
@@ -298,10 +296,7 @@ class KollaWorker(object):
         ts = datetime.datetime.fromtimestamp(ts).strftime('%Y-%m-%d_%H-%M-%S_')
         self.temp_dir = tempfile.mkdtemp(prefix='kolla-' + ts)
         self.working_dir = os.path.join(self.temp_dir, 'docker')
-        if self.template:
-            shutil.copytree(self.templates_dir, self.working_dir)
-        else:
-            shutil.copytree(self.images_dir, self.working_dir)
+        shutil.copytree(self.images_dir, self.working_dir)
         LOG.debug('Created working dir: {}'.format(self.working_dir))
 
     def set_time(self):
@@ -335,13 +330,8 @@ class KollaWorker(object):
     def find_dockerfiles(self):
         """Recursive search for Dockerfiles in the working directory"""
         self.docker_build_paths = list()
-
-        if self.template:
-            path = self.working_dir
-            filename = 'Dockerfile.j2'
-        else:
-            path = os.path.join(self.working_dir, self.base, self.type_)
-            filename = 'Dockerfile'
+        path = self.working_dir
+        filename = 'Dockerfile.j2'
 
         for root, dirs, names in os.walk(path):
             if filename in names:
@@ -427,16 +417,10 @@ class KollaWorker(object):
 
     def build_image_list(self):
         self.images = list()
-
-        # Walk all of the Dockerfiles and replace the %%KOLLA%% variables
         for path in self.docker_build_paths:
+            # Reading parent image name
             with open(os.path.join(path, 'Dockerfile')) as f:
-                content = f.read().replace('%%KOLLA_NAMESPACE%%',
-                                           self.namespace)
-                content = content.replace('%%KOLLA_PREFIX%%', self.prefix)
-                content = content.replace('%%KOLLA_TAG%%', self.tag)
-            with open(os.path.join(path, 'Dockerfile'), 'w') as f:
-                f.write(content)
+                content = f.read()
 
             image = dict()
             image['status'] = "unprocessed"
@@ -526,9 +510,7 @@ def main():
     kolla = KollaWorker(args)
     kolla.setup_working_dir()
     kolla.find_dockerfiles()
-
-    if args['template']:
-        kolla.create_dockerfiles()
+    kolla.create_dockerfiles()
 
     # We set the atime and mtime to 0 epoch to preserve allow the Docker cache
     # to work like we want. A different size or hash will still force a rebuild
diff --git a/setup.cfg b/setup.cfg
index 6db6a4a3e..678776679 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,7 +24,6 @@ data_files =
     share/kolla/ansible = ansible/*
     share/kolla/devenv = devenv/*
     share/kolla/docker = docker/*
-    share/kolla/docker_templates = docker_templates/*
     share/kolla/docs = docs/*
     share/kolla/etc_examples = etc/*
     share/kolla/vagrant = vagrant/*
diff --git a/tox.ini b/tox.ini
index b3ddde967..a35748db1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -124,4 +124,4 @@ commands =
 
 [flake8]
 show-source = True
-exclude=.git,.tox,doc,ansible/library,docker/centos/binary/kolla-ansible,docker_templates/kolla-ansible,docker/common/kolla-ansible
+exclude=.git,.tox,doc,ansible/library,docker/kolla-ansible