diff --git a/README.rst b/README.rst index 5bab37cf5e..7bcc693c82 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 similarity index 100% rename from docker_templates/base/Dockerfile.j2 rename to docker/base/Dockerfile.j2 diff --git a/docker_templates/base/kolla-common.sh b/docker/base/kolla-common.sh similarity index 100% rename from docker_templates/base/kolla-common.sh rename to docker/base/kolla-common.sh diff --git a/docker_templates/base/mariadb.yum.repo b/docker/base/mariadb.yum.repo similarity index 100% rename from docker_templates/base/mariadb.yum.repo rename to docker/base/mariadb.yum.repo diff --git a/docker_templates/base/sources.list b/docker/base/sources.list similarity index 100% rename from docker_templates/base/sources.list rename to docker/base/sources.list diff --git a/docker_templates/ceilometer/ceilometer-alarm/Dockerfile.j2 b/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 similarity index 100% rename from docker_templates/ceilometer/ceilometer-alarm/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/ceilometer/ceilometer-alarm/config-external.sh rename to docker/ceilometer/ceilometer-alarm/config-external.sh diff --git a/docker_templates/ceilometer/ceilometer-alarm/start.sh b/docker/ceilometer/ceilometer-alarm/start.sh similarity index 100% rename from docker_templates/ceilometer/ceilometer-alarm/start.sh rename to docker/ceilometer/ceilometer-alarm/start.sh diff --git a/docker_templates/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 similarity index 100% rename from docker_templates/ceilometer/ceilometer-api/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/ceilometer/ceilometer-api/config-external.sh rename to docker/ceilometer/ceilometer-api/config-external.sh diff --git a/docker_templates/ceilometer/ceilometer-api/start.sh b/docker/ceilometer/ceilometer-api/start.sh similarity index 100% rename from docker_templates/ceilometer/ceilometer-api/start.sh rename to docker/ceilometer/ceilometer-api/start.sh diff --git a/docker_templates/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 similarity index 100% rename from docker_templates/ceilometer/ceilometer-base/Dockerfile.j2 rename to docker/ceilometer/ceilometer-base/Dockerfile.j2 diff --git a/docker_templates/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2 similarity index 100% rename from docker_templates/ceilometer/ceilometer-central/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/ceilometer/ceilometer-central/config-external.sh rename to docker/ceilometer/ceilometer-central/config-external.sh diff --git a/docker_templates/ceilometer/ceilometer-central/start.sh b/docker/ceilometer/ceilometer-central/start.sh similarity index 100% rename from docker_templates/ceilometer/ceilometer-central/start.sh rename to docker/ceilometer/ceilometer-central/start.sh diff --git a/docker_templates/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 similarity index 100% rename from docker_templates/ceilometer/ceilometer-collector/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/ceilometer/ceilometer-collector/config-external.sh rename to docker/ceilometer/ceilometer-collector/config-external.sh diff --git a/docker_templates/ceilometer/ceilometer-collector/start.sh b/docker/ceilometer/ceilometer-collector/start.sh similarity index 100% rename from docker_templates/ceilometer/ceilometer-collector/start.sh rename to docker/ceilometer/ceilometer-collector/start.sh diff --git a/docker_templates/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 similarity index 100% rename from docker_templates/ceilometer/ceilometer-compute/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/ceilometer/ceilometer-compute/config-external.sh rename to docker/ceilometer/ceilometer-compute/config-external.sh diff --git a/docker_templates/ceilometer/ceilometer-compute/start.sh b/docker/ceilometer/ceilometer-compute/start.sh similarity index 100% rename from docker_templates/ceilometer/ceilometer-compute/start.sh rename to docker/ceilometer/ceilometer-compute/start.sh diff --git a/docker_templates/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 similarity index 100% rename from docker_templates/ceilometer/ceilometer-notification/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/ceilometer/ceilometer-notification/config-external.sh rename to docker/ceilometer/ceilometer-notification/config-external.sh diff --git a/docker_templates/ceilometer/ceilometer-notification/start.sh b/docker/ceilometer/ceilometer-notification/start.sh similarity index 100% rename from docker_templates/ceilometer/ceilometer-notification/start.sh rename to docker/ceilometer/ceilometer-notification/start.sh diff --git a/docker_templates/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 similarity index 100% rename from docker_templates/cinder/cinder-api/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/cinder/cinder-api/config-external.sh rename to docker/cinder/cinder-api/config-external.sh diff --git a/docker_templates/cinder/cinder-api/start.sh b/docker/cinder/cinder-api/start.sh similarity index 100% rename from docker_templates/cinder/cinder-api/start.sh rename to docker/cinder/cinder-api/start.sh diff --git a/docker_templates/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2 similarity index 100% rename from docker_templates/cinder/cinder-backup/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/cinder/cinder-backup/config-external.sh rename to docker/cinder/cinder-backup/config-external.sh diff --git a/docker_templates/cinder/cinder-backup/start.sh b/docker/cinder/cinder-backup/start.sh similarity index 100% rename from docker_templates/cinder/cinder-backup/start.sh rename to docker/cinder/cinder-backup/start.sh diff --git a/docker_templates/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 similarity index 100% rename from docker_templates/cinder/cinder-base/Dockerfile.j2 rename to docker/cinder/cinder-base/Dockerfile.j2 diff --git a/docker_templates/cinder/cinder-scheduler/Dockerfile.j2 b/docker/cinder/cinder-scheduler/Dockerfile.j2 similarity index 100% rename from docker_templates/cinder/cinder-scheduler/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/cinder/cinder-scheduler/config-external.sh rename to docker/cinder/cinder-scheduler/config-external.sh diff --git a/docker_templates/cinder/cinder-scheduler/start.sh b/docker/cinder/cinder-scheduler/start.sh similarity index 100% rename from docker_templates/cinder/cinder-scheduler/start.sh rename to docker/cinder/cinder-scheduler/start.sh diff --git a/docker_templates/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 similarity index 100% rename from docker_templates/cinder/cinder-volume/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/cinder/cinder-volume/config-external.sh rename to docker/cinder/cinder-volume/config-external.sh diff --git a/docker_templates/cinder/cinder-volume/start.sh b/docker/cinder/cinder-volume/start.sh similarity index 100% rename from docker_templates/cinder/cinder-volume/start.sh rename to docker/cinder/cinder-volume/start.sh diff --git a/docker_templates/data/Dockerfile.j2 b/docker/data/Dockerfile.j2 similarity index 100% rename from docker_templates/data/Dockerfile.j2 rename to docker/data/Dockerfile.j2 diff --git a/docker_templates/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2 similarity index 100% rename from docker_templates/designate/designate-api/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/designate/designate-api/config-external.sh rename to docker/designate/designate-api/config-external.sh diff --git a/docker_templates/designate/designate-api/start.sh b/docker/designate/designate-api/start.sh similarity index 100% rename from docker_templates/designate/designate-api/start.sh rename to 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 similarity index 100% rename from docker_templates/designate/designate-backend-bind9/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/designate/designate-backend-bind9/config-external.sh rename to 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 similarity index 100% rename from docker_templates/designate/designate-backend-bind9/start.sh rename to docker/designate/designate-backend-bind9/start.sh diff --git a/docker_templates/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2 similarity index 100% rename from docker_templates/designate/designate-base/Dockerfile.j2 rename to docker/designate/designate-base/Dockerfile.j2 diff --git a/docker_templates/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2 similarity index 100% rename from docker_templates/designate/designate-central/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/designate/designate-central/config-external.sh rename to docker/designate/designate-central/config-external.sh diff --git a/docker_templates/designate/designate-central/start.sh b/docker/designate/designate-central/start.sh similarity index 100% rename from docker_templates/designate/designate-central/start.sh rename to docker/designate/designate-central/start.sh diff --git a/docker_templates/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2 similarity index 100% rename from docker_templates/designate/designate-mdns/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/designate/designate-mdns/config-external.sh rename to docker/designate/designate-mdns/config-external.sh diff --git a/docker_templates/designate/designate-mdns/start.sh b/docker/designate/designate-mdns/start.sh similarity index 100% rename from docker_templates/designate/designate-mdns/start.sh rename to docker/designate/designate-mdns/start.sh diff --git a/docker_templates/designate/designate-poolmanager/Dockerfile.j2 b/docker/designate/designate-poolmanager/Dockerfile.j2 similarity index 100% rename from docker_templates/designate/designate-poolmanager/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/designate/designate-poolmanager/config-external.sh rename to docker/designate/designate-poolmanager/config-external.sh diff --git a/docker_templates/designate/designate-poolmanager/start.sh b/docker/designate/designate-poolmanager/start.sh similarity index 100% rename from docker_templates/designate/designate-poolmanager/start.sh rename to docker/designate/designate-poolmanager/start.sh diff --git a/docker_templates/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2 similarity index 100% rename from docker_templates/designate/designate-sink/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/designate/designate-sink/config-external.sh rename to docker/designate/designate-sink/config-external.sh diff --git a/docker_templates/designate/designate-sink/start.sh b/docker/designate/designate-sink/start.sh similarity index 100% rename from docker_templates/designate/designate-sink/start.sh rename to docker/designate/designate-sink/start.sh diff --git a/docker_templates/galera/Dockerfile.j2 b/docker/galera/Dockerfile.j2 similarity index 100% rename from docker_templates/galera/Dockerfile.j2 rename to docker/galera/Dockerfile.j2 diff --git a/docker_templates/galera/config-external.sh b/docker/galera/config-external.sh similarity index 100% rename from docker_templates/galera/config-external.sh rename to docker/galera/config-external.sh diff --git a/docker_templates/galera/config-galera.sh b/docker/galera/config-galera.sh similarity index 100% rename from docker_templates/galera/config-galera.sh rename to docker/galera/config-galera.sh diff --git a/docker_templates/galera/start.sh b/docker/galera/start.sh similarity index 100% rename from docker_templates/galera/start.sh rename to docker/galera/start.sh diff --git a/docker_templates/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 similarity index 100% rename from docker_templates/glance/glance-api/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/glance/glance-api/config-external.sh rename to docker/glance/glance-api/config-external.sh diff --git a/docker_templates/glance/glance-api/start.sh b/docker/glance/glance-api/start.sh similarity index 100% rename from docker_templates/glance/glance-api/start.sh rename to docker/glance/glance-api/start.sh diff --git a/docker_templates/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 similarity index 100% rename from docker_templates/glance/glance-base/Dockerfile.j2 rename to docker/glance/glance-base/Dockerfile.j2 diff --git a/docker_templates/glance/glance-registry/Dockerfile.j2 b/docker/glance/glance-registry/Dockerfile.j2 similarity index 100% rename from docker_templates/glance/glance-registry/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/glance/glance-registry/config-external.sh rename to docker/glance/glance-registry/config-external.sh diff --git a/docker_templates/glance/glance-registry/start.sh b/docker/glance/glance-registry/start.sh similarity index 100% rename from docker_templates/glance/glance-registry/start.sh rename to docker/glance/glance-registry/start.sh diff --git a/docker_templates/gnocchi/gnocchi-api/Dockerfile.j2 b/docker/gnocchi/gnocchi-api/Dockerfile.j2 similarity index 100% rename from docker_templates/gnocchi/gnocchi-api/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/gnocchi/gnocchi-api/config-external.sh rename to docker/gnocchi/gnocchi-api/config-external.sh diff --git a/docker_templates/gnocchi/gnocchi-api/start.sh b/docker/gnocchi/gnocchi-api/start.sh similarity index 100% rename from docker_templates/gnocchi/gnocchi-api/start.sh rename to docker/gnocchi/gnocchi-api/start.sh diff --git a/docker_templates/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 similarity index 100% rename from docker_templates/gnocchi/gnocchi-base/Dockerfile.j2 rename to docker/gnocchi/gnocchi-base/Dockerfile.j2 diff --git a/docker_templates/gnocchi/gnocchi-statsd/Dockerfile.j2 b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 similarity index 100% rename from docker_templates/gnocchi/gnocchi-statsd/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/gnocchi/gnocchi-statsd/config-external.sh rename to docker/gnocchi/gnocchi-statsd/config-external.sh diff --git a/docker_templates/gnocchi/gnocchi-statsd/start.sh b/docker/gnocchi/gnocchi-statsd/start.sh similarity index 100% rename from docker_templates/gnocchi/gnocchi-statsd/start.sh rename to docker/gnocchi/gnocchi-statsd/start.sh diff --git a/docker_templates/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2 similarity index 100% rename from docker_templates/haproxy/Dockerfile.j2 rename to docker/haproxy/Dockerfile.j2 diff --git a/docker_templates/haproxy/config-external.sh b/docker/haproxy/config-external.sh similarity index 100% rename from docker_templates/haproxy/config-external.sh rename to docker/haproxy/config-external.sh diff --git a/docker_templates/haproxy/ensure_latest_config.sh b/docker/haproxy/ensure_latest_config.sh similarity index 100% rename from docker_templates/haproxy/ensure_latest_config.sh rename to docker/haproxy/ensure_latest_config.sh diff --git a/docker_templates/haproxy/start.sh b/docker/haproxy/start.sh similarity index 100% rename from docker_templates/haproxy/start.sh rename to docker/haproxy/start.sh diff --git a/docker_templates/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 similarity index 100% rename from docker_templates/heat/heat-api-cfn/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/heat/heat-api-cfn/config-external.sh rename to 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 similarity index 100% rename from docker_templates/heat/heat-api-cfn/start.sh rename to docker/heat/heat-api-cfn/start.sh diff --git a/docker_templates/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2 similarity index 100% rename from docker_templates/heat/heat-api/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/heat/heat-api/config-external.sh rename to docker/heat/heat-api/config-external.sh diff --git a/docker_templates/heat/heat-api/start.sh b/docker/heat/heat-api/start.sh similarity index 100% rename from docker_templates/heat/heat-api/start.sh rename to docker/heat/heat-api/start.sh diff --git a/docker_templates/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 similarity index 100% rename from docker_templates/heat/heat-base/Dockerfile.j2 rename to docker/heat/heat-base/Dockerfile.j2 diff --git a/docker_templates/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2 similarity index 100% rename from docker_templates/heat/heat-engine/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/heat/heat-engine/config-external.sh rename to docker/heat/heat-engine/config-external.sh diff --git a/docker_templates/heat/heat-engine/start.sh b/docker/heat/heat-engine/start.sh similarity index 100% rename from docker_templates/heat/heat-engine/start.sh rename to docker/heat/heat-engine/start.sh diff --git a/docker_templates/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 similarity index 100% rename from docker_templates/horizon/Dockerfile.j2 rename to docker/horizon/Dockerfile.j2 diff --git a/docker_templates/horizon/config-external.sh b/docker/horizon/config-external.sh similarity index 100% rename from docker_templates/horizon/config-external.sh rename to docker/horizon/config-external.sh diff --git a/docker_templates/horizon/start.sh b/docker/horizon/start.sh similarity index 100% rename from docker_templates/horizon/start.sh rename to docker/horizon/start.sh diff --git a/docker_templates/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2 similarity index 100% rename from docker_templates/ironic/ironic-api/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/ironic/ironic-api/config-external.sh rename to docker/ironic/ironic-api/config-external.sh diff --git a/docker_templates/ironic/ironic-api/start.sh b/docker/ironic/ironic-api/start.sh similarity index 100% rename from docker_templates/ironic/ironic-api/start.sh rename to docker/ironic/ironic-api/start.sh diff --git a/docker_templates/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2 similarity index 100% rename from docker_templates/ironic/ironic-base/Dockerfile.j2 rename to docker/ironic/ironic-base/Dockerfile.j2 diff --git a/docker_templates/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 similarity index 100% rename from docker_templates/ironic/ironic-conductor/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/ironic/ironic-conductor/config-external.sh rename to docker/ironic/ironic-conductor/config-external.sh diff --git a/docker_templates/ironic/ironic-conductor/start.sh b/docker/ironic/ironic-conductor/start.sh similarity index 100% rename from docker_templates/ironic/ironic-conductor/start.sh rename to docker/ironic/ironic-conductor/start.sh diff --git a/docker_templates/ironic/ironic-discoverd/Dockerfile.j2 b/docker/ironic/ironic-discoverd/Dockerfile.j2 similarity index 100% rename from docker_templates/ironic/ironic-discoverd/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/ironic/ironic-discoverd/config-external.sh rename to docker/ironic/ironic-discoverd/config-external.sh diff --git a/docker_templates/ironic/ironic-discoverd/start.sh b/docker/ironic/ironic-discoverd/start.sh similarity index 100% rename from docker_templates/ironic/ironic-discoverd/start.sh rename to docker/ironic/ironic-discoverd/start.sh diff --git a/docker_templates/keepalived/Dockerfile.j2 b/docker/keepalived/Dockerfile.j2 similarity index 100% rename from docker_templates/keepalived/Dockerfile.j2 rename to docker/keepalived/Dockerfile.j2 diff --git a/docker_templates/keepalived/check_alive.sh b/docker/keepalived/check_alive.sh similarity index 100% rename from docker_templates/keepalived/check_alive.sh rename to docker/keepalived/check_alive.sh diff --git a/docker_templates/keepalived/config-external.sh b/docker/keepalived/config-external.sh similarity index 100% rename from docker_templates/keepalived/config-external.sh rename to docker/keepalived/config-external.sh diff --git a/docker_templates/keepalived/start.sh b/docker/keepalived/start.sh similarity index 100% rename from docker_templates/keepalived/start.sh rename to docker/keepalived/start.sh diff --git a/docker_templates/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2 similarity index 100% rename from docker_templates/keystone/Dockerfile.j2 rename to docker/keystone/Dockerfile.j2 diff --git a/docker_templates/keystone/config-external.sh b/docker/keystone/config-external.sh similarity index 100% rename from docker_templates/keystone/config-external.sh rename to docker/keystone/config-external.sh diff --git a/docker_templates/keystone/start.sh b/docker/keystone/start.sh similarity index 100% rename from docker_templates/keystone/start.sh rename to docker/keystone/start.sh diff --git a/docker_templates/kolla-ansible/Dockerfile.j2 b/docker/kolla-ansible/Dockerfile.j2 similarity index 100% rename from docker_templates/kolla-ansible/Dockerfile.j2 rename to docker/kolla-ansible/Dockerfile.j2 diff --git a/docker_templates/kolla-ansible/kolla_keystone_service.py b/docker/kolla-ansible/kolla_keystone_service.py similarity index 100% rename from docker_templates/kolla-ansible/kolla_keystone_service.py rename to 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 similarity index 100% rename from docker_templates/kolla-ansible/kolla_keystone_user.py rename to docker/kolla-ansible/kolla_keystone_user.py diff --git a/docker_templates/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2 similarity index 100% rename from docker_templates/magnum/magnum-api/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/magnum/magnum-api/config-external.sh rename to docker/magnum/magnum-api/config-external.sh diff --git a/docker_templates/magnum/magnum-api/start.sh b/docker/magnum/magnum-api/start.sh similarity index 100% rename from docker_templates/magnum/magnum-api/start.sh rename to docker/magnum/magnum-api/start.sh diff --git a/docker_templates/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2 similarity index 100% rename from docker_templates/magnum/magnum-base/Dockerfile.j2 rename to docker/magnum/magnum-base/Dockerfile.j2 diff --git a/docker_templates/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2 similarity index 100% rename from docker_templates/magnum/magnum-conductor/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/magnum/magnum-conductor/config-external.sh rename to docker/magnum/magnum-conductor/config-external.sh diff --git a/docker_templates/magnum/magnum-conductor/start.sh b/docker/magnum/magnum-conductor/start.sh similarity index 100% rename from docker_templates/magnum/magnum-conductor/start.sh rename to docker/magnum/magnum-conductor/start.sh diff --git a/docker_templates/memcached/Dockerfile.j2 b/docker/memcached/Dockerfile.j2 similarity index 100% rename from docker_templates/memcached/Dockerfile.j2 rename to docker/memcached/Dockerfile.j2 diff --git a/docker_templates/memcached/config-external.sh b/docker/memcached/config-external.sh similarity index 100% rename from docker_templates/memcached/config-external.sh rename to docker/memcached/config-external.sh diff --git a/docker_templates/memcached/start.sh b/docker/memcached/start.sh similarity index 100% rename from docker_templates/memcached/start.sh rename to docker/memcached/start.sh diff --git a/docker_templates/mongodb/Dockerfile.j2 b/docker/mongodb/Dockerfile.j2 similarity index 100% rename from docker_templates/mongodb/Dockerfile.j2 rename to docker/mongodb/Dockerfile.j2 diff --git a/docker_templates/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2 similarity index 100% rename from docker_templates/murano/murano-api/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/murano/murano-api/config-external.sh rename to docker/murano/murano-api/config-external.sh diff --git a/docker_templates/murano/murano-api/start.sh b/docker/murano/murano-api/start.sh similarity index 100% rename from docker_templates/murano/murano-api/start.sh rename to docker/murano/murano-api/start.sh diff --git a/docker_templates/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2 similarity index 100% rename from docker_templates/murano/murano-base/Dockerfile.j2 rename to docker/murano/murano-base/Dockerfile.j2 diff --git a/docker_templates/murano/murano-engine/Dockerfile.j2 b/docker/murano/murano-engine/Dockerfile.j2 similarity index 100% rename from docker_templates/murano/murano-engine/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/murano/murano-engine/config-external.sh rename to docker/murano/murano-engine/config-external.sh diff --git a/docker_templates/murano/murano-engine/start.sh b/docker/murano/murano-engine/start.sh similarity index 100% rename from docker_templates/murano/murano-engine/start.sh rename to docker/murano/murano-engine/start.sh diff --git a/docker_templates/neutron/neutron-agents/Dockerfile.j2 b/docker/neutron/neutron-agents/Dockerfile.j2 similarity index 100% rename from docker_templates/neutron/neutron-agents/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/neutron/neutron-agents/fwaas_driver.ini rename to 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 similarity index 100% rename from docker_templates/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh rename to 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 similarity index 100% rename from docker_templates/neutron/neutron-agents/neutron-dhcp-agent/start.sh rename to 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 similarity index 100% rename from docker_templates/neutron/neutron-agents/neutron-l3-agent/config-external.sh rename to 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 similarity index 100% rename from docker_templates/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini rename to 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 similarity index 100% rename from docker_templates/neutron/neutron-agents/neutron-l3-agent/start.sh rename to 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 similarity index 100% rename from docker_templates/neutron/neutron-agents/neutron-metadata-agent/config-external.sh rename to 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 similarity index 100% rename from docker_templates/neutron/neutron-agents/neutron-metadata-agent/start.sh rename to 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 similarity index 100% rename from docker_templates/neutron/neutron-agents/supervisord.conf rename to docker/neutron/neutron-agents/supervisord.conf diff --git a/docker_templates/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 similarity index 100% rename from docker_templates/neutron/neutron-base/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/neutron/neutron-base/config-sudoers.sh rename to 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 similarity index 100% rename from docker_templates/neutron/neutron-base/ip_wrapper.py rename to 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 similarity index 100% rename from docker_templates/neutron/neutron-linuxbridge-agent/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/neutron/neutron-linuxbridge-agent/config-external.sh rename to 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 similarity index 100% rename from docker_templates/neutron/neutron-linuxbridge-agent/start.sh rename to 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 similarity index 100% rename from docker_templates/neutron/neutron-openvswitch-agent/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/neutron/neutron-openvswitch-agent/config-external.sh rename to 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 similarity index 100% rename from docker_templates/neutron/neutron-openvswitch-agent/start.sh rename to docker/neutron/neutron-openvswitch-agent/start.sh diff --git a/docker_templates/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 similarity index 100% rename from docker_templates/neutron/neutron-server/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/neutron/neutron-server/config-external.sh rename to docker/neutron/neutron-server/config-external.sh diff --git a/docker_templates/neutron/neutron-server/start.sh b/docker/neutron/neutron-server/start.sh similarity index 100% rename from docker_templates/neutron/neutron-server/start.sh rename to docker/neutron/neutron-server/start.sh diff --git a/docker_templates/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 similarity index 100% rename from docker_templates/nova/nova-api/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/nova/nova-api/config-external.sh rename to docker/nova/nova-api/config-external.sh diff --git a/docker_templates/nova/nova-api/start.sh b/docker/nova/nova-api/start.sh similarity index 100% rename from docker_templates/nova/nova-api/start.sh rename to docker/nova/nova-api/start.sh diff --git a/docker_templates/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 similarity index 100% rename from docker_templates/nova/nova-base/Dockerfile.j2 rename to docker/nova/nova-base/Dockerfile.j2 diff --git a/docker_templates/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 similarity index 100% rename from docker_templates/nova/nova-compute/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/nova/nova-compute/config-external.sh rename to docker/nova/nova-compute/config-external.sh diff --git a/docker_templates/nova/nova-compute/start.sh b/docker/nova/nova-compute/start.sh similarity index 100% rename from docker_templates/nova/nova-compute/start.sh rename to docker/nova/nova-compute/start.sh diff --git a/docker_templates/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2 similarity index 100% rename from docker_templates/nova/nova-conductor/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/nova/nova-conductor/config-external.sh rename to docker/nova/nova-conductor/config-external.sh diff --git a/docker_templates/nova/nova-conductor/start.sh b/docker/nova/nova-conductor/start.sh similarity index 100% rename from docker_templates/nova/nova-conductor/start.sh rename to docker/nova/nova-conductor/start.sh diff --git a/docker_templates/nova/nova-consoleauth/Dockerfile.j2 b/docker/nova/nova-consoleauth/Dockerfile.j2 similarity index 100% rename from docker_templates/nova/nova-consoleauth/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/nova/nova-consoleauth/config-external.sh rename to docker/nova/nova-consoleauth/config-external.sh diff --git a/docker_templates/nova/nova-consoleauth/start.sh b/docker/nova/nova-consoleauth/start.sh similarity index 100% rename from docker_templates/nova/nova-consoleauth/start.sh rename to docker/nova/nova-consoleauth/start.sh diff --git a/docker_templates/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 similarity index 100% rename from docker_templates/nova/nova-libvirt/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/nova/nova-libvirt/config-external.sh rename to docker/nova/nova-libvirt/config-external.sh diff --git a/docker_templates/nova/nova-libvirt/start.sh b/docker/nova/nova-libvirt/start.sh similarity index 100% rename from docker_templates/nova/nova-libvirt/start.sh rename to docker/nova/nova-libvirt/start.sh diff --git a/docker_templates/nova/nova-network/Dockerfile.j2 b/docker/nova/nova-network/Dockerfile.j2 similarity index 100% rename from docker_templates/nova/nova-network/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/nova/nova-network/config-external.sh rename to docker/nova/nova-network/config-external.sh diff --git a/docker_templates/nova/nova-network/start.sh b/docker/nova/nova-network/start.sh similarity index 100% rename from docker_templates/nova/nova-network/start.sh rename to docker/nova/nova-network/start.sh diff --git a/docker_templates/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2 similarity index 100% rename from docker_templates/nova/nova-novncproxy/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/nova/nova-novncproxy/config-external.sh rename to docker/nova/nova-novncproxy/config-external.sh diff --git a/docker_templates/nova/nova-novncproxy/start.sh b/docker/nova/nova-novncproxy/start.sh similarity index 100% rename from docker_templates/nova/nova-novncproxy/start.sh rename to docker/nova/nova-novncproxy/start.sh diff --git a/docker_templates/nova/nova-scheduler/Dockerfile.j2 b/docker/nova/nova-scheduler/Dockerfile.j2 similarity index 100% rename from docker_templates/nova/nova-scheduler/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/nova/nova-scheduler/config-external.sh rename to docker/nova/nova-scheduler/config-external.sh diff --git a/docker_templates/nova/nova-scheduler/start.sh b/docker/nova/nova-scheduler/start.sh similarity index 100% rename from docker_templates/nova/nova-scheduler/start.sh rename to docker/nova/nova-scheduler/start.sh diff --git a/docker_templates/openvswitch/ovs-base/Dockerfile.j2 b/docker/openvswitch/ovs-base/Dockerfile.j2 similarity index 100% rename from docker_templates/openvswitch/ovs-base/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/openvswitch/ovs-db-server/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/openvswitch/ovs-db-server/config-external.sh rename to 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 similarity index 100% rename from docker_templates/openvswitch/ovs-db-server/start.sh rename to docker/openvswitch/ovs-db-server/start.sh diff --git a/docker_templates/openvswitch/ovs-vswitchd/Dockerfile.j2 b/docker/openvswitch/ovs-vswitchd/Dockerfile.j2 similarity index 100% rename from docker_templates/openvswitch/ovs-vswitchd/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/openvswitch/ovs-vswitchd/config-external.sh rename to 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 similarity index 100% rename from docker_templates/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh rename to 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 similarity index 100% rename from docker_templates/openvswitch/ovs-vswitchd/start.sh rename to docker/openvswitch/ovs-vswitchd/start.sh diff --git a/docker_templates/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 similarity index 100% rename from docker_templates/rabbitmq/Dockerfile.j2 rename to docker/rabbitmq/Dockerfile.j2 diff --git a/docker_templates/rabbitmq/config-external.sh b/docker/rabbitmq/config-external.sh similarity index 100% rename from docker_templates/rabbitmq/config-external.sh rename to docker/rabbitmq/config-external.sh diff --git a/docker_templates/rabbitmq/config-rabbit.sh b/docker/rabbitmq/config-rabbit.sh similarity index 100% rename from docker_templates/rabbitmq/config-rabbit.sh rename to docker/rabbitmq/config-rabbit.sh diff --git a/docker_templates/rabbitmq/start.sh b/docker/rabbitmq/start.sh similarity index 100% rename from docker_templates/rabbitmq/start.sh rename to docker/rabbitmq/start.sh diff --git a/docker_templates/swift/swift-account-server/Dockerfile.j2 b/docker/swift/swift-account-server/Dockerfile.j2 similarity index 100% rename from docker_templates/swift/swift-account-server/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/swift/swift-account-server/config-external.sh rename to 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 similarity index 100% rename from docker_templates/swift/swift-account-server/start.sh rename to docker/swift/swift-account-server/start.sh diff --git a/docker_templates/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 similarity index 100% rename from docker_templates/swift/swift-base/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/swift/swift-base/build-swift-ring.py rename to 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 similarity index 100% rename from docker_templates/swift/swift-base/config-swift.sh rename to 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 similarity index 100% rename from docker_templates/swift/swift-container-server/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/swift/swift-container-server/config-external.sh rename to 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 similarity index 100% rename from docker_templates/swift/swift-container-server/start.sh rename to 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 similarity index 100% rename from docker_templates/swift/swift-object-auditor/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/swift/swift-object-auditor/config-external.sh rename to 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 similarity index 100% rename from docker_templates/swift/swift-object-auditor/start.sh rename to 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 similarity index 100% rename from docker_templates/swift/swift-object-base/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/swift/swift-object-base/config-swift-object.sh rename to 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 similarity index 100% rename from docker_templates/swift/swift-object-expirer/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/swift/swift-object-expirer/config-external.sh rename to 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 similarity index 100% rename from docker_templates/swift/swift-object-expirer/start.sh rename to 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 similarity index 100% rename from docker_templates/swift/swift-object-replicator/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/swift/swift-object-replicator/config-external.sh rename to 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 similarity index 100% rename from docker_templates/swift/swift-object-replicator/start.sh rename to 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 similarity index 100% rename from docker_templates/swift/swift-object-server/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/swift/swift-object-server/config-external.sh rename to 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 similarity index 100% rename from docker_templates/swift/swift-object-server/start.sh rename to 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 similarity index 100% rename from docker_templates/swift/swift-object-updater/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/swift/swift-object-updater/config-external.sh rename to 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 similarity index 100% rename from docker_templates/swift/swift-object-updater/start.sh rename to 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 similarity index 100% rename from docker_templates/swift/swift-proxy-server/Dockerfile.j2 rename to 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 similarity index 100% rename from docker_templates/swift/swift-proxy-server/config-external.sh rename to 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 similarity index 100% rename from docker_templates/swift/swift-proxy-server/start.sh rename to docker/swift/swift-proxy-server/start.sh diff --git a/docker_templates/zaqar/Dockerfile.j2 b/docker/zaqar/Dockerfile.j2 similarity index 100% rename from docker_templates/zaqar/Dockerfile.j2 rename to docker/zaqar/Dockerfile.j2 diff --git a/docker_templates/zaqar/config-external.sh b/docker/zaqar/config-external.sh similarity index 100% rename from docker_templates/zaqar/config-external.sh rename to docker/zaqar/config-external.sh diff --git a/docker_templates/zaqar/start.sh b/docker/zaqar/start.sh similarity index 100% rename from docker_templates/zaqar/start.sh rename to docker/zaqar/start.sh diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py index d3842d581d..ed1de00358 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 6db6a4a3e2..678776679e 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 b3ddde9674..a35748db1a 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