374 files changed, 47 insertions, 42 deletions

diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/kolla/docker/aodh/aodh-api/Dockerfile.j2
index b420df814..b420df814 100644
--- a/docker/aodh/aodh-api/Dockerfile.j2
+++ b/kolla/docker/aodh/aodh-api/Dockerfile.j2
diff --git a/docker/aodh/aodh-api/extend_start.sh b/kolla/docker/aodh/aodh-api/extend_start.sh
index 575b0e584..575b0e584 100644
--- a/docker/aodh/aodh-api/extend_start.sh
+++ b/kolla/docker/aodh/aodh-api/extend_start.sh
diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/kolla/docker/aodh/aodh-base/Dockerfile.j2
index 519537468..519537468 100644
--- a/docker/aodh/aodh-base/Dockerfile.j2
+++ b/kolla/docker/aodh/aodh-base/Dockerfile.j2
diff --git a/docker/aodh/aodh-base/aodh_sudoers b/kolla/docker/aodh/aodh-base/aodh_sudoers
index 2ec268c9d..2ec268c9d 100644
--- a/docker/aodh/aodh-base/aodh_sudoers
+++ b/kolla/docker/aodh/aodh-base/aodh_sudoers
diff --git a/docker/aodh/aodh-base/extend_start.sh b/kolla/docker/aodh/aodh-base/extend_start.sh
index f3b1d2d49..f3b1d2d49 100755
--- a/docker/aodh/aodh-base/extend_start.sh
+++ b/kolla/docker/aodh/aodh-base/extend_start.sh
diff --git a/docker/aodh/aodh-evaluator/Dockerfile.j2 b/kolla/docker/aodh/aodh-evaluator/Dockerfile.j2
index 3d1f6a8b4..3d1f6a8b4 100644
--- a/docker/aodh/aodh-evaluator/Dockerfile.j2
+++ b/kolla/docker/aodh/aodh-evaluator/Dockerfile.j2
diff --git a/docker/aodh/aodh-expirer/Dockerfile.j2 b/kolla/docker/aodh/aodh-expirer/Dockerfile.j2
index 9c426f82c..9c426f82c 100644
--- a/docker/aodh/aodh-expirer/Dockerfile.j2
+++ b/kolla/docker/aodh/aodh-expirer/Dockerfile.j2
diff --git a/docker/aodh/aodh-listener/Dockerfile.j2 b/kolla/docker/aodh/aodh-listener/Dockerfile.j2
index a6f4f3c0e..a6f4f3c0e 100644
--- a/docker/aodh/aodh-listener/Dockerfile.j2
+++ b/kolla/docker/aodh/aodh-listener/Dockerfile.j2
diff --git a/docker/aodh/aodh-notifier/Dockerfile.j2 b/kolla/docker/aodh/aodh-notifier/Dockerfile.j2
index c49f37441..c49f37441 100644
--- a/docker/aodh/aodh-notifier/Dockerfile.j2
+++ b/kolla/docker/aodh/aodh-notifier/Dockerfile.j2
diff --git a/docker/barbican/barbican-api/Dockerfile.j2 b/kolla/docker/barbican/barbican-api/Dockerfile.j2
index e78f3ea63..e78f3ea63 100644
--- a/docker/barbican/barbican-api/Dockerfile.j2
+++ b/kolla/docker/barbican/barbican-api/Dockerfile.j2
diff --git a/docker/barbican/barbican-api/extend_start.sh b/kolla/docker/barbican/barbican-api/extend_start.sh
index c541d0343..c541d0343 100755
--- a/docker/barbican/barbican-api/extend_start.sh
+++ b/kolla/docker/barbican/barbican-api/extend_start.sh
diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/kolla/docker/barbican/barbican-base/Dockerfile.j2
index 89c44ef9a..89c44ef9a 100644
--- a/docker/barbican/barbican-base/Dockerfile.j2
+++ b/kolla/docker/barbican/barbican-base/Dockerfile.j2
diff --git a/docker/barbican/barbican-base/barbican_sudoers b/kolla/docker/barbican/barbican-base/barbican_sudoers
index 26ae4710e..26ae4710e 100644
--- a/docker/barbican/barbican-base/barbican_sudoers
+++ b/kolla/docker/barbican/barbican-base/barbican_sudoers
diff --git a/docker/barbican/barbican-base/extend_start.sh b/kolla/docker/barbican/barbican-base/extend_start.sh
index 16b41ad09..16b41ad09 100755
--- a/docker/barbican/barbican-base/extend_start.sh
+++ b/kolla/docker/barbican/barbican-base/extend_start.sh
diff --git a/docker/barbican/barbican-keystone-listener/Dockerfile.j2 b/kolla/docker/barbican/barbican-keystone-listener/Dockerfile.j2
index 3329aed1b..3329aed1b 100644
--- a/docker/barbican/barbican-keystone-listener/Dockerfile.j2
+++ b/kolla/docker/barbican/barbican-keystone-listener/Dockerfile.j2
diff --git a/docker/barbican/barbican-worker/Dockerfile.j2 b/kolla/docker/barbican/barbican-worker/Dockerfile.j2
index 9cba55b6b..9cba55b6b 100644
--- a/docker/barbican/barbican-worker/Dockerfile.j2
+++ b/kolla/docker/barbican/barbican-worker/Dockerfile.j2
diff --git a/docker/base/Dockerfile.j2 b/kolla/docker/base/Dockerfile.j2
index 0e2f3c1ab..0e2f3c1ab 100644
--- a/docker/base/Dockerfile.j2
+++ b/kolla/docker/base/Dockerfile.j2
diff --git a/docker/base/apt_preferences b/kolla/docker/base/apt_preferences
index dc5b993f1..dc5b993f1 100644
--- a/docker/base/apt_preferences
+++ b/kolla/docker/base/apt_preferences
diff --git a/docker/base/apt_preferences.debian b/kolla/docker/base/apt_preferences.debian
index 08e21ff22..08e21ff22 100644
--- a/docker/base/apt_preferences.debian
+++ b/kolla/docker/base/apt_preferences.debian
diff --git a/docker/base/apt_preferences.ubuntu b/kolla/docker/base/apt_preferences.ubuntu
index 7cc49b4ad..7cc49b4ad 100644
--- a/docker/base/apt_preferences.ubuntu
+++ b/kolla/docker/base/apt_preferences.ubuntu
diff --git a/docker/base/ci-centos.repo b/kolla/docker/base/ci-centos.repo
index 4c08f1fea..4c08f1fea 100644
--- a/docker/base/ci-centos.repo
+++ b/kolla/docker/base/ci-centos.repo
diff --git a/docker/base/copy_cacerts.sh b/kolla/docker/base/copy_cacerts.sh
index 213033c0c..213033c0c 100644
--- a/docker/base/copy_cacerts.sh
+++ b/kolla/docker/base/copy_cacerts.sh
diff --git a/docker/base/curlrc b/kolla/docker/base/curlrc
index 3b1ecea06..3b1ecea06 100644
--- a/docker/base/curlrc
+++ b/kolla/docker/base/curlrc
diff --git a/docker/base/debian.sources b/kolla/docker/base/debian.sources
index 28c61c81d..28c61c81d 100644
--- a/docker/base/debian.sources
+++ b/kolla/docker/base/debian.sources
diff --git a/docker/base/dnf.conf b/kolla/docker/base/dnf.conf
index 6ca687545..6ca687545 100644
--- a/docker/base/dnf.conf
+++ b/kolla/docker/base/dnf.conf
diff --git a/docker/base/dpkg_reducing_disk_footprint b/kolla/docker/base/dpkg_reducing_disk_footprint
index 87b8255f9..87b8255f9 100644
--- a/docker/base/dpkg_reducing_disk_footprint
+++ b/kolla/docker/base/dpkg_reducing_disk_footprint
diff --git a/docker/base/healthcheck_curl b/kolla/docker/base/healthcheck_curl
index 6df232fe8..6df232fe8 100755
--- a/docker/base/healthcheck_curl
+++ b/kolla/docker/base/healthcheck_curl
diff --git a/docker/base/healthcheck_filemod b/kolla/docker/base/healthcheck_filemod
index 007643d9b..007643d9b 100755
--- a/docker/base/healthcheck_filemod
+++ b/kolla/docker/base/healthcheck_filemod
diff --git a/docker/base/healthcheck_listen b/kolla/docker/base/healthcheck_listen
index 70273339c..70273339c 100755
--- a/docker/base/healthcheck_listen
+++ b/kolla/docker/base/healthcheck_listen
diff --git a/docker/base/healthcheck_port b/kolla/docker/base/healthcheck_port
index 9531bd77a..9531bd77a 100755
--- a/docker/base/healthcheck_port
+++ b/kolla/docker/base/healthcheck_port
diff --git a/docker/base/healthcheck_socket b/kolla/docker/base/healthcheck_socket
index cd65bae69..cd65bae69 100755
--- a/docker/base/healthcheck_socket
+++ b/kolla/docker/base/healthcheck_socket
diff --git a/docker/base/install_projects.sh b/kolla/docker/base/install_projects.sh
index c3f7182b5..c3f7182b5 100644
--- a/docker/base/install_projects.sh
+++ b/kolla/docker/base/install_projects.sh
diff --git a/docker/base/kolla_bashrc b/kolla/docker/base/kolla_bashrc
index 09b19cc06..09b19cc06 100644
--- a/docker/base/kolla_bashrc
+++ b/kolla/docker/base/kolla_bashrc
diff --git a/docker/base/kolla_patch.sh b/kolla/docker/base/kolla_patch.sh
index b17a5b61d..b17a5b61d 100755
--- a/docker/base/kolla_patch.sh
+++ b/kolla/docker/base/kolla_patch.sh
diff --git a/docker/base/set_configs.py b/kolla/docker/base/set_configs.py
index 4b025d55a..4b025d55a 100644
--- a/docker/base/set_configs.py
+++ b/kolla/docker/base/set_configs.py
diff --git a/docker/base/sources.list b/kolla/docker/base/sources.list
index 1acbbcb59..1acbbcb59 100644
--- a/docker/base/sources.list
+++ b/kolla/docker/base/sources.list
diff --git a/docker/base/start.sh b/kolla/docker/base/start.sh
index 7ac505aea..7ac505aea 100644
--- a/docker/base/start.sh
+++ b/kolla/docker/base/start.sh
diff --git a/docker/base/sudoers b/kolla/docker/base/sudoers
index eb31bc98b..eb31bc98b 100644
--- a/docker/base/sudoers
+++ b/kolla/docker/base/sudoers
diff --git a/docker/base/ubuntu.sources b/kolla/docker/base/ubuntu.sources
index f8f609cee..f8f609cee 100644
--- a/docker/base/ubuntu.sources
+++ b/kolla/docker/base/ubuntu.sources
diff --git a/docker/base/ubuntu.sources.arm64 b/kolla/docker/base/ubuntu.sources.arm64
index 751af7ccf..751af7ccf 100644
--- a/docker/base/ubuntu.sources.arm64
+++ b/kolla/docker/base/ubuntu.sources.arm64
diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/kolla/docker/bifrost/bifrost-base/Dockerfile.j2
index 3e82a9fd3..3e82a9fd3 100644
--- a/docker/bifrost/bifrost-base/Dockerfile.j2
+++ b/kolla/docker/bifrost/bifrost-base/Dockerfile.j2
diff --git a/docker/bifrost/bifrost-base/bifrost_sudoers b/kolla/docker/bifrost/bifrost-base/bifrost_sudoers
index 6c343a956..6c343a956 100644
--- a/docker/bifrost/bifrost-base/bifrost_sudoers
+++ b/kolla/docker/bifrost/bifrost-base/bifrost_sudoers
diff --git a/docker/bifrost/bifrost-base/build_arg.yml b/kolla/docker/bifrost/bifrost-base/build_arg.yml
index 8c810f133..8c810f133 100644
--- a/docker/bifrost/bifrost-base/build_arg.yml
+++ b/kolla/docker/bifrost/bifrost-base/build_arg.yml
diff --git a/docker/bifrost/bifrost-deploy/Dockerfile.j2 b/kolla/docker/bifrost/bifrost-deploy/Dockerfile.j2
index 04fc733fc..04fc733fc 100644
--- a/docker/bifrost/bifrost-deploy/Dockerfile.j2
+++ b/kolla/docker/bifrost/bifrost-deploy/Dockerfile.j2
diff --git a/docker/blazar/blazar-api/Dockerfile.j2 b/kolla/docker/blazar/blazar-api/Dockerfile.j2
index 70d6ba22a..70d6ba22a 100644
--- a/docker/blazar/blazar-api/Dockerfile.j2
+++ b/kolla/docker/blazar/blazar-api/Dockerfile.j2
diff --git a/docker/blazar/blazar-api/extend_start.sh b/kolla/docker/blazar/blazar-api/extend_start.sh
index ff4f2b801..ff4f2b801 100644
--- a/docker/blazar/blazar-api/extend_start.sh
+++ b/kolla/docker/blazar/blazar-api/extend_start.sh
diff --git a/docker/blazar/blazar-base/Dockerfile.j2 b/kolla/docker/blazar/blazar-base/Dockerfile.j2
index 433842e41..433842e41 100644
--- a/docker/blazar/blazar-base/Dockerfile.j2
+++ b/kolla/docker/blazar/blazar-base/Dockerfile.j2
diff --git a/docker/blazar/blazar-base/extend_start.sh b/kolla/docker/blazar/blazar-base/extend_start.sh
index a96a4c113..a96a4c113 100644
--- a/docker/blazar/blazar-base/extend_start.sh
+++ b/kolla/docker/blazar/blazar-base/extend_start.sh
diff --git a/docker/blazar/blazar-manager/Dockerfile.j2 b/kolla/docker/blazar/blazar-manager/Dockerfile.j2
index 5cde3db3b..5cde3db3b 100644
--- a/docker/blazar/blazar-manager/Dockerfile.j2
+++ b/kolla/docker/blazar/blazar-manager/Dockerfile.j2
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/kolla/docker/ceilometer/ceilometer-base/Dockerfile.j2
index 18bd7600a..18bd7600a 100644
--- a/docker/ceilometer/ceilometer-base/Dockerfile.j2
+++ b/kolla/docker/ceilometer/ceilometer-base/Dockerfile.j2
diff --git a/docker/ceilometer/ceilometer-base/ceilometer_sudoers b/kolla/docker/ceilometer/ceilometer-base/ceilometer_sudoers
index dd861bb58..dd861bb58 100644
--- a/docker/ceilometer/ceilometer-base/ceilometer_sudoers
+++ b/kolla/docker/ceilometer/ceilometer-base/ceilometer_sudoers
diff --git a/docker/ceilometer/ceilometer-base/extend_start.sh b/kolla/docker/ceilometer/ceilometer-base/extend_start.sh
index 4d3fe6b61..4d3fe6b61 100644
--- a/docker/ceilometer/ceilometer-base/extend_start.sh
+++ b/kolla/docker/ceilometer/ceilometer-base/extend_start.sh
diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/kolla/docker/ceilometer/ceilometer-central/Dockerfile.j2
index df96d8ed3..df96d8ed3 100644
--- a/docker/ceilometer/ceilometer-central/Dockerfile.j2
+++ b/kolla/docker/ceilometer/ceilometer-central/Dockerfile.j2
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/kolla/docker/ceilometer/ceilometer-compute/Dockerfile.j2
index 879c4fb01..879c4fb01 100644
--- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2
+++ b/kolla/docker/ceilometer/ceilometer-compute/Dockerfile.j2
diff --git a/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 b/kolla/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2
index a767dc842..a767dc842 100644
--- a/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2
+++ b/kolla/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2
diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/kolla/docker/ceilometer/ceilometer-notification/Dockerfile.j2
index 1fc03ffc4..1fc03ffc4 100644
--- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2
+++ b/kolla/docker/ceilometer/ceilometer-notification/Dockerfile.j2
diff --git a/docker/ceilometer/ceilometer-notification/extend_start.sh b/kolla/docker/ceilometer/ceilometer-notification/extend_start.sh
index 0abeeb1e1..0abeeb1e1 100644
--- a/docker/ceilometer/ceilometer-notification/extend_start.sh
+++ b/kolla/docker/ceilometer/ceilometer-notification/extend_start.sh
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/kolla/docker/cinder/cinder-api/Dockerfile.j2
index b82fba6d3..b82fba6d3 100644
--- a/docker/cinder/cinder-api/Dockerfile.j2
+++ b/kolla/docker/cinder/cinder-api/Dockerfile.j2
diff --git a/docker/cinder/cinder-api/extend_start.sh b/kolla/docker/cinder/cinder-api/extend_start.sh
index 94b0fe875..94b0fe875 100644
--- a/docker/cinder/cinder-api/extend_start.sh
+++ b/kolla/docker/cinder/cinder-api/extend_start.sh
diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/kolla/docker/cinder/cinder-backup/Dockerfile.j2
index 15be355dd..15be355dd 100644
--- a/docker/cinder/cinder-backup/Dockerfile.j2
+++ b/kolla/docker/cinder/cinder-backup/Dockerfile.j2
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/kolla/docker/cinder/cinder-base/Dockerfile.j2
index bd25d9b18..bd25d9b18 100644
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ b/kolla/docker/cinder/cinder-base/Dockerfile.j2
diff --git a/docker/cinder/cinder-base/cinder_sudoers b/kolla/docker/cinder/cinder-base/cinder_sudoers
index 3750f31a0..3750f31a0 100644
--- a/docker/cinder/cinder-base/cinder_sudoers
+++ b/kolla/docker/cinder/cinder-base/cinder_sudoers
diff --git a/docker/cinder/cinder-base/extend_start.sh b/kolla/docker/cinder/cinder-base/extend_start.sh
index ddf1469c9..ddf1469c9 100644
--- a/docker/cinder/cinder-base/extend_start.sh
+++ b/kolla/docker/cinder/cinder-base/extend_start.sh
diff --git a/docker/cinder/cinder-scheduler/Dockerfile.j2 b/kolla/docker/cinder/cinder-scheduler/Dockerfile.j2
index c43792dcc..c43792dcc 100644
--- a/docker/cinder/cinder-scheduler/Dockerfile.j2
+++ b/kolla/docker/cinder/cinder-scheduler/Dockerfile.j2
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/kolla/docker/cinder/cinder-volume/Dockerfile.j2
index 0e4f38a6e..0e4f38a6e 100644
--- a/docker/cinder/cinder-volume/Dockerfile.j2
+++ b/kolla/docker/cinder/cinder-volume/Dockerfile.j2
diff --git a/docker/cinder/cinder-volume/cinder_sudoers b/kolla/docker/cinder/cinder-volume/cinder_sudoers
index f3bec8b13..f3bec8b13 100644
--- a/docker/cinder/cinder-volume/cinder_sudoers
+++ b/kolla/docker/cinder/cinder-volume/cinder_sudoers
diff --git a/docker/cinder/cinder-volume/extend_start.sh b/kolla/docker/cinder/cinder-volume/extend_start.sh
index 67e866143..67e866143 100644
--- a/docker/cinder/cinder-volume/extend_start.sh
+++ b/kolla/docker/cinder/cinder-volume/extend_start.sh
diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/kolla/docker/cloudkitty/cloudkitty-api/Dockerfile.j2
index fd3d124f3..fd3d124f3 100644
--- a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2
+++ b/kolla/docker/cloudkitty/cloudkitty-api/Dockerfile.j2
diff --git a/docker/cloudkitty/cloudkitty-api/extend_start.sh b/kolla/docker/cloudkitty/cloudkitty-api/extend_start.sh
index 26d4a8c36..26d4a8c36 100644
--- a/docker/cloudkitty/cloudkitty-api/extend_start.sh
+++ b/kolla/docker/cloudkitty/cloudkitty-api/extend_start.sh
diff --git a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 b/kolla/docker/cloudkitty/cloudkitty-base/Dockerfile.j2
index b545d4adf..b545d4adf 100644
--- a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2
+++ b/kolla/docker/cloudkitty/cloudkitty-base/Dockerfile.j2
diff --git a/docker/cloudkitty/cloudkitty-base/extend_start.sh b/kolla/docker/cloudkitty/cloudkitty-base/extend_start.sh
index cf49f9caf..cf49f9caf 100644
--- a/docker/cloudkitty/cloudkitty-base/extend_start.sh
+++ b/kolla/docker/cloudkitty/cloudkitty-base/extend_start.sh
diff --git a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 b/kolla/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2
index 33f30fd33..33f30fd33 100644
--- a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2
+++ b/kolla/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2
diff --git a/docker/collectd/Dockerfile.j2 b/kolla/docker/collectd/Dockerfile.j2
index 32ded377e..32ded377e 100644
--- a/docker/collectd/Dockerfile.j2
+++ b/kolla/docker/collectd/Dockerfile.j2
diff --git a/docker/collectd/extend_start.sh b/kolla/docker/collectd/extend_start.sh
index 80ef63db3..80ef63db3 100644
--- a/docker/collectd/extend_start.sh
+++ b/kolla/docker/collectd/extend_start.sh
diff --git a/docker/cron/Dockerfile.j2 b/kolla/docker/cron/Dockerfile.j2
index d3a9213ac..d3a9213ac 100644
--- a/docker/cron/Dockerfile.j2
+++ b/kolla/docker/cron/Dockerfile.j2
diff --git a/docker/cron/extend_start.sh b/kolla/docker/cron/extend_start.sh
index 3476302e1..3476302e1 100644
--- a/docker/cron/extend_start.sh
+++ b/kolla/docker/cron/extend_start.sh
diff --git a/docker/cron/logrotate b/kolla/docker/cron/logrotate
index 1ac157001..1ac157001 100755
--- a/docker/cron/logrotate
+++ b/kolla/docker/cron/logrotate
diff --git a/docker/cyborg/cyborg-agent/Dockerfile.j2 b/kolla/docker/cyborg/cyborg-agent/Dockerfile.j2
index dfc1adc0b..dfc1adc0b 100644
--- a/docker/cyborg/cyborg-agent/Dockerfile.j2
+++ b/kolla/docker/cyborg/cyborg-agent/Dockerfile.j2
diff --git a/docker/cyborg/cyborg-api/Dockerfile.j2 b/kolla/docker/cyborg/cyborg-api/Dockerfile.j2
index d67cdeb28..d67cdeb28 100644
--- a/docker/cyborg/cyborg-api/Dockerfile.j2
+++ b/kolla/docker/cyborg/cyborg-api/Dockerfile.j2
diff --git a/docker/cyborg/cyborg-api/extend_start.sh b/kolla/docker/cyborg/cyborg-api/extend_start.sh
index b1c7af7af..b1c7af7af 100644
--- a/docker/cyborg/cyborg-api/extend_start.sh
+++ b/kolla/docker/cyborg/cyborg-api/extend_start.sh
diff --git a/docker/cyborg/cyborg-base/Dockerfile.j2 b/kolla/docker/cyborg/cyborg-base/Dockerfile.j2
index c3f3e602a..c3f3e602a 100644
--- a/docker/cyborg/cyborg-base/Dockerfile.j2
+++ b/kolla/docker/cyborg/cyborg-base/Dockerfile.j2
diff --git a/docker/cyborg/cyborg-base/cyborg_sudoers b/kolla/docker/cyborg/cyborg-base/cyborg_sudoers
index 63440026d..63440026d 100644
--- a/docker/cyborg/cyborg-base/cyborg_sudoers
+++ b/kolla/docker/cyborg/cyborg-base/cyborg_sudoers
diff --git a/docker/cyborg/cyborg-base/extend_start.sh b/kolla/docker/cyborg/cyborg-base/extend_start.sh
index 10a58c626..10a58c626 100755
--- a/docker/cyborg/cyborg-base/extend_start.sh
+++ b/kolla/docker/cyborg/cyborg-base/extend_start.sh
diff --git a/docker/cyborg/cyborg-conductor/Dockerfile.j2 b/kolla/docker/cyborg/cyborg-conductor/Dockerfile.j2
index d17d1cacd..d17d1cacd 100644
--- a/docker/cyborg/cyborg-conductor/Dockerfile.j2
+++ b/kolla/docker/cyborg/cyborg-conductor/Dockerfile.j2
diff --git a/docker/designate/designate-api/Dockerfile.j2 b/kolla/docker/designate/designate-api/Dockerfile.j2
index 6ca9ac180..6ca9ac180 100644
--- a/docker/designate/designate-api/Dockerfile.j2
+++ b/kolla/docker/designate/designate-api/Dockerfile.j2
diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/kolla/docker/designate/designate-backend-bind9/Dockerfile.j2
index cf1277aeb..cf1277aeb 100644
--- a/docker/designate/designate-backend-bind9/Dockerfile.j2
+++ b/kolla/docker/designate/designate-backend-bind9/Dockerfile.j2
diff --git a/docker/designate/designate-base/Dockerfile.j2 b/kolla/docker/designate/designate-base/Dockerfile.j2
index 26a0beca1..26a0beca1 100644
--- a/docker/designate/designate-base/Dockerfile.j2
+++ b/kolla/docker/designate/designate-base/Dockerfile.j2
diff --git a/docker/designate/designate-base/designate_sudoers b/kolla/docker/designate/designate-base/designate_sudoers
index d06679fe2..d06679fe2 100644
--- a/docker/designate/designate-base/designate_sudoers
+++ b/kolla/docker/designate/designate-base/designate_sudoers
diff --git a/docker/designate/designate-base/extend_start.sh b/kolla/docker/designate/designate-base/extend_start.sh
index 66b376c30..66b376c30 100644
--- a/docker/designate/designate-base/extend_start.sh
+++ b/kolla/docker/designate/designate-base/extend_start.sh
diff --git a/docker/designate/designate-central/Dockerfile.j2 b/kolla/docker/designate/designate-central/Dockerfile.j2
index 81c3c901f..81c3c901f 100644
--- a/docker/designate/designate-central/Dockerfile.j2
+++ b/kolla/docker/designate/designate-central/Dockerfile.j2
diff --git a/docker/designate/designate-central/extend_start.sh b/kolla/docker/designate/designate-central/extend_start.sh
index 8e90f55fc..8e90f55fc 100644
--- a/docker/designate/designate-central/extend_start.sh
+++ b/kolla/docker/designate/designate-central/extend_start.sh
diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/kolla/docker/designate/designate-mdns/Dockerfile.j2
index dd2e6df75..dd2e6df75 100644
--- a/docker/designate/designate-mdns/Dockerfile.j2
+++ b/kolla/docker/designate/designate-mdns/Dockerfile.j2
diff --git a/docker/designate/designate-producer/Dockerfile.j2 b/kolla/docker/designate/designate-producer/Dockerfile.j2
index bd1ce4e1d..bd1ce4e1d 100644
--- a/docker/designate/designate-producer/Dockerfile.j2
+++ b/kolla/docker/designate/designate-producer/Dockerfile.j2
diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/kolla/docker/designate/designate-sink/Dockerfile.j2
index 8b8e50adf..8b8e50adf 100644
--- a/docker/designate/designate-sink/Dockerfile.j2
+++ b/kolla/docker/designate/designate-sink/Dockerfile.j2
diff --git a/docker/designate/designate-worker/Dockerfile.j2 b/kolla/docker/designate/designate-worker/Dockerfile.j2
index b4e190df6..b4e190df6 100644
--- a/docker/designate/designate-worker/Dockerfile.j2
+++ b/kolla/docker/designate/designate-worker/Dockerfile.j2
diff --git a/docker/dnsmasq/Dockerfile.j2 b/kolla/docker/dnsmasq/Dockerfile.j2
index 882613be7..882613be7 100644
--- a/docker/dnsmasq/Dockerfile.j2
+++ b/kolla/docker/dnsmasq/Dockerfile.j2
diff --git a/docker/dnsmasq/extend_start.sh b/kolla/docker/dnsmasq/extend_start.sh
index 0c9734fa1..0c9734fa1 100644
--- a/docker/dnsmasq/extend_start.sh
+++ b/kolla/docker/dnsmasq/extend_start.sh
diff --git a/docker/etcd/Dockerfile.j2 b/kolla/docker/etcd/Dockerfile.j2
index aafcd8666..aafcd8666 100644
--- a/docker/etcd/Dockerfile.j2
+++ b/kolla/docker/etcd/Dockerfile.j2
diff --git a/docker/etcd/etcd_sudoers b/kolla/docker/etcd/etcd_sudoers
index d3e244be0..d3e244be0 100644
--- a/docker/etcd/etcd_sudoers
+++ b/kolla/docker/etcd/etcd_sudoers
diff --git a/docker/etcd/extend_start.sh b/kolla/docker/etcd/extend_start.sh
index c54023299..c54023299 100644
--- a/docker/etcd/extend_start.sh
+++ b/kolla/docker/etcd/extend_start.sh
diff --git a/docker/fluentd/Dockerfile.j2 b/kolla/docker/fluentd/Dockerfile.j2
index c63e1b990..c63e1b990 100644
--- a/docker/fluentd/Dockerfile.j2
+++ b/kolla/docker/fluentd/Dockerfile.j2
diff --git a/docker/fluentd/extend_start.sh b/kolla/docker/fluentd/extend_start.sh
index 6b304b92c..6b304b92c 100644
--- a/docker/fluentd/extend_start.sh
+++ b/kolla/docker/fluentd/extend_start.sh
diff --git a/docker/fluentd/fluentd_sudoers b/kolla/docker/fluentd/fluentd_sudoers
index 25ca93f5a..25ca93f5a 100644
--- a/docker/fluentd/fluentd_sudoers
+++ b/kolla/docker/fluentd/fluentd_sudoers
diff --git a/docker/glance/glance-api/Dockerfile.j2 b/kolla/docker/glance/glance-api/Dockerfile.j2
index e3efbfef3..e3efbfef3 100644
--- a/docker/glance/glance-api/Dockerfile.j2
+++ b/kolla/docker/glance/glance-api/Dockerfile.j2
diff --git a/docker/glance/glance-api/extend_start.sh b/kolla/docker/glance/glance-api/extend_start.sh
index 3363539a5..3363539a5 100644
--- a/docker/glance/glance-api/extend_start.sh
+++ b/kolla/docker/glance/glance-api/extend_start.sh
diff --git a/docker/glance/glance-base/Dockerfile.j2 b/kolla/docker/glance/glance-base/Dockerfile.j2
index 885cc4353..885cc4353 100644
--- a/docker/glance/glance-base/Dockerfile.j2
+++ b/kolla/docker/glance/glance-base/Dockerfile.j2
diff --git a/docker/glance/glance-base/etc/glance/rootwrap.conf b/kolla/docker/glance/glance-base/etc/glance/rootwrap.conf
index 56e7529af..56e7529af 100644
--- a/docker/glance/glance-base/etc/glance/rootwrap.conf
+++ b/kolla/docker/glance/glance-base/etc/glance/rootwrap.conf
diff --git a/docker/glance/glance-base/etc/glance/rootwrap.d/glance_cinder_store.filters b/kolla/docker/glance/glance-base/etc/glance/rootwrap.d/glance_cinder_store.filters
index 46c389b7e..46c389b7e 100644
--- a/docker/glance/glance-base/etc/glance/rootwrap.d/glance_cinder_store.filters
+++ b/kolla/docker/glance/glance-base/etc/glance/rootwrap.d/glance_cinder_store.filters
diff --git a/docker/glance/glance-base/extend_start.sh b/kolla/docker/glance/glance-base/extend_start.sh
index 4f5f5ecaf..4f5f5ecaf 100644
--- a/docker/glance/glance-base/extend_start.sh
+++ b/kolla/docker/glance/glance-base/extend_start.sh
diff --git a/docker/glance/glance-base/glance_sudoers b/kolla/docker/glance/glance-base/glance_sudoers
index 9af870983..9af870983 100644
--- a/docker/glance/glance-base/glance_sudoers
+++ b/kolla/docker/glance/glance-base/glance_sudoers
diff --git a/docker/gnocchi/gnocchi-api/Dockerfile.j2 b/kolla/docker/gnocchi/gnocchi-api/Dockerfile.j2
index c0cc2cc33..c0cc2cc33 100644
--- a/docker/gnocchi/gnocchi-api/Dockerfile.j2
+++ b/kolla/docker/gnocchi/gnocchi-api/Dockerfile.j2
diff --git a/docker/gnocchi/gnocchi-api/extend_start.sh b/kolla/docker/gnocchi/gnocchi-api/extend_start.sh
index dda0461c6..dda0461c6 100644
--- a/docker/gnocchi/gnocchi-api/extend_start.sh
+++ b/kolla/docker/gnocchi/gnocchi-api/extend_start.sh
diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/kolla/docker/gnocchi/gnocchi-base/Dockerfile.j2
index 91199ac39..91199ac39 100644
--- a/docker/gnocchi/gnocchi-base/Dockerfile.j2
+++ b/kolla/docker/gnocchi/gnocchi-base/Dockerfile.j2
diff --git a/docker/gnocchi/gnocchi-base/extend_start.sh b/kolla/docker/gnocchi/gnocchi-base/extend_start.sh
index adc05b1b3..adc05b1b3 100644
--- a/docker/gnocchi/gnocchi-base/extend_start.sh
+++ b/kolla/docker/gnocchi/gnocchi-base/extend_start.sh
diff --git a/docker/gnocchi/gnocchi-base/gnocchi_sudoers b/kolla/docker/gnocchi/gnocchi-base/gnocchi_sudoers
index c2a01d709..c2a01d709 100644
--- a/docker/gnocchi/gnocchi-base/gnocchi_sudoers
+++ b/kolla/docker/gnocchi/gnocchi-base/gnocchi_sudoers
diff --git a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 b/kolla/docker/gnocchi/gnocchi-metricd/Dockerfile.j2
index fe9978fa2..fe9978fa2 100644
--- a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2
+++ b/kolla/docker/gnocchi/gnocchi-metricd/Dockerfile.j2
diff --git a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 b/kolla/docker/gnocchi/gnocchi-statsd/Dockerfile.j2
index 8f1574946..8f1574946 100644
--- a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2
+++ b/kolla/docker/gnocchi/gnocchi-statsd/Dockerfile.j2
diff --git a/docker/grafana/Dockerfile.j2 b/kolla/docker/grafana/Dockerfile.j2
index e401d91b6..e401d91b6 100644
--- a/docker/grafana/Dockerfile.j2
+++ b/kolla/docker/grafana/Dockerfile.j2
diff --git a/docker/grafana/extend_start.sh b/kolla/docker/grafana/extend_start.sh
index 5ed4dc56d..5ed4dc56d 100644
--- a/docker/grafana/extend_start.sh
+++ b/kolla/docker/grafana/extend_start.sh
diff --git a/docker/grafana/grafana_sudoers b/kolla/docker/grafana/grafana_sudoers
index 386829969..386829969 100644
--- a/docker/grafana/grafana_sudoers
+++ b/kolla/docker/grafana/grafana_sudoers
diff --git a/docker/hacluster/hacluster-base/Dockerfile.j2 b/kolla/docker/hacluster/hacluster-base/Dockerfile.j2
index 045f21e1e..045f21e1e 100644
--- a/docker/hacluster/hacluster-base/Dockerfile.j2
+++ b/kolla/docker/hacluster/hacluster-base/Dockerfile.j2
diff --git a/docker/hacluster/hacluster-base/extend_start.sh b/kolla/docker/hacluster/hacluster-base/extend_start.sh
index c0e9301d0..c0e9301d0 100644
--- a/docker/hacluster/hacluster-base/extend_start.sh
+++ b/kolla/docker/hacluster/hacluster-base/extend_start.sh
diff --git a/docker/hacluster/hacluster-corosync/Dockerfile.j2 b/kolla/docker/hacluster/hacluster-corosync/Dockerfile.j2
index 74d47c380..74d47c380 100644
--- a/docker/hacluster/hacluster-corosync/Dockerfile.j2
+++ b/kolla/docker/hacluster/hacluster-corosync/Dockerfile.j2
diff --git a/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 b/kolla/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2
index 64c381e1f..64c381e1f 100644
--- a/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2
+++ b/kolla/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2
diff --git a/docker/hacluster/hacluster-pacemaker/Dockerfile.j2 b/kolla/docker/hacluster/hacluster-pacemaker/Dockerfile.j2
index 33eeb3144..33eeb3144 100644
--- a/docker/hacluster/hacluster-pacemaker/Dockerfile.j2
+++ b/kolla/docker/hacluster/hacluster-pacemaker/Dockerfile.j2
diff --git a/docker/hacluster/hacluster-pcs/Dockerfile.j2 b/kolla/docker/hacluster/hacluster-pcs/Dockerfile.j2
index a146d0d4b..a146d0d4b 100644
--- a/docker/hacluster/hacluster-pcs/Dockerfile.j2
+++ b/kolla/docker/hacluster/hacluster-pcs/Dockerfile.j2
diff --git a/docker/haproxy/haproxy-ssh/Dockerfile.j2 b/kolla/docker/haproxy/haproxy-ssh/Dockerfile.j2
index a674cc75e..a674cc75e 100644
--- a/docker/haproxy/haproxy-ssh/Dockerfile.j2
+++ b/kolla/docker/haproxy/haproxy-ssh/Dockerfile.j2
diff --git a/docker/haproxy/haproxy-ssh/extend_start.sh b/kolla/docker/haproxy/haproxy-ssh/extend_start.sh
index 4b2239100..4b2239100 100644
--- a/docker/haproxy/haproxy-ssh/extend_start.sh
+++ b/kolla/docker/haproxy/haproxy-ssh/extend_start.sh
diff --git a/docker/haproxy/haproxy-ssh/update-loadbalancer-cert.sh b/kolla/docker/haproxy/haproxy-ssh/update-loadbalancer-cert.sh
index 7e4122c65..7e4122c65 100755
--- a/docker/haproxy/haproxy-ssh/update-loadbalancer-cert.sh
+++ b/kolla/docker/haproxy/haproxy-ssh/update-loadbalancer-cert.sh
diff --git a/docker/haproxy/haproxy/Dockerfile.j2 b/kolla/docker/haproxy/haproxy/Dockerfile.j2
index 36c7ca943..36c7ca943 100644
--- a/docker/haproxy/haproxy/Dockerfile.j2
+++ b/kolla/docker/haproxy/haproxy/Dockerfile.j2
diff --git a/docker/haproxy/haproxy/ensure_latest_config.sh b/kolla/docker/haproxy/haproxy/ensure_latest_config.sh
index 4b84f3aed..4b84f3aed 100644
--- a/docker/haproxy/haproxy/ensure_latest_config.sh
+++ b/kolla/docker/haproxy/haproxy/ensure_latest_config.sh
diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/kolla/docker/heat/heat-api-cfn/Dockerfile.j2
index db3030c8d..db3030c8d 100644
--- a/docker/heat/heat-api-cfn/Dockerfile.j2
+++ b/kolla/docker/heat/heat-api-cfn/Dockerfile.j2
diff --git a/docker/heat/heat-api/Dockerfile.j2 b/kolla/docker/heat/heat-api/Dockerfile.j2
index af2471279..af2471279 100644
--- a/docker/heat/heat-api/Dockerfile.j2
+++ b/kolla/docker/heat/heat-api/Dockerfile.j2
diff --git a/docker/heat/heat-api/extend_start.sh b/kolla/docker/heat/heat-api/extend_start.sh
index ddf4f81f4..ddf4f81f4 100644
--- a/docker/heat/heat-api/extend_start.sh
+++ b/kolla/docker/heat/heat-api/extend_start.sh
diff --git a/docker/heat/heat-base/Dockerfile.j2 b/kolla/docker/heat/heat-base/Dockerfile.j2
index a06ea6f0d..a06ea6f0d 100644
--- a/docker/heat/heat-base/Dockerfile.j2
+++ b/kolla/docker/heat/heat-base/Dockerfile.j2
diff --git a/docker/heat/heat-base/extend_start.sh b/kolla/docker/heat/heat-base/extend_start.sh
index 1c1e86b8e..1c1e86b8e 100644
--- a/docker/heat/heat-base/extend_start.sh
+++ b/kolla/docker/heat/heat-base/extend_start.sh
diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/kolla/docker/heat/heat-engine/Dockerfile.j2
index 86c943582..86c943582 100644
--- a/docker/heat/heat-engine/Dockerfile.j2
+++ b/kolla/docker/heat/heat-engine/Dockerfile.j2
diff --git a/docker/horizon/Dockerfile.j2 b/kolla/docker/horizon/Dockerfile.j2
index 73dc65dd1..73dc65dd1 100644
--- a/docker/horizon/Dockerfile.j2
+++ b/kolla/docker/horizon/Dockerfile.j2
diff --git a/docker/horizon/extend_start.sh b/kolla/docker/horizon/extend_start.sh
index d1198adb4..d1198adb4 100644
--- a/docker/horizon/extend_start.sh
+++ b/kolla/docker/horizon/extend_start.sh
diff --git a/docker/httpd/Dockerfile.j2 b/kolla/docker/httpd/Dockerfile.j2
index ec5637283..ec5637283 100644
--- a/docker/httpd/Dockerfile.j2
+++ b/kolla/docker/httpd/Dockerfile.j2
diff --git a/docker/httpd/extend_start.sh b/kolla/docker/httpd/extend_start.sh
index d47af64b9..d47af64b9 100644
--- a/docker/httpd/extend_start.sh
+++ b/kolla/docker/httpd/extend_start.sh
diff --git a/docker/httpd/httpd_setup.sh b/kolla/docker/httpd/httpd_setup.sh
index 35f7b5b1e..35f7b5b1e 100644
--- a/docker/httpd/httpd_setup.sh
+++ b/kolla/docker/httpd/httpd_setup.sh
diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/kolla/docker/ironic/ironic-api/Dockerfile.j2
index 1c10d0372..1c10d0372 100644
--- a/docker/ironic/ironic-api/Dockerfile.j2
+++ b/kolla/docker/ironic/ironic-api/Dockerfile.j2
diff --git a/docker/ironic/ironic-api/extend_start.sh b/kolla/docker/ironic/ironic-api/extend_start.sh
index ce2f7fb3e..ce2f7fb3e 100644
--- a/docker/ironic/ironic-api/extend_start.sh
+++ b/kolla/docker/ironic/ironic-api/extend_start.sh
diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/kolla/docker/ironic/ironic-base/Dockerfile.j2
index e2f7871f6..e2f7871f6 100644
--- a/docker/ironic/ironic-base/Dockerfile.j2
+++ b/kolla/docker/ironic/ironic-base/Dockerfile.j2
diff --git a/docker/ironic/ironic-base/extend_start.sh b/kolla/docker/ironic/ironic-base/extend_start.sh
index dc6b05caa..dc6b05caa 100644
--- a/docker/ironic/ironic-base/extend_start.sh
+++ b/kolla/docker/ironic/ironic-base/extend_start.sh
diff --git a/docker/ironic/ironic-base/ironic_sudoers b/kolla/docker/ironic/ironic-base/ironic_sudoers
index 9b9deed4d..9b9deed4d 100644
--- a/docker/ironic/ironic-base/ironic_sudoers
+++ b/kolla/docker/ironic/ironic-base/ironic_sudoers
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/kolla/docker/ironic/ironic-conductor/Dockerfile.j2
index bce981fb0..bce981fb0 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/kolla/docker/ironic/ironic-conductor/Dockerfile.j2
diff --git a/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 b/kolla/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2
index 2ac448dfd..2ac448dfd 100644
--- a/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2
+++ b/kolla/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2
diff --git a/docker/ironic/ironic-pxe-filter/Dockerfile.j2 b/kolla/docker/ironic/ironic-pxe-filter/Dockerfile.j2
index 5b593e9f0..5b593e9f0 100644
--- a/docker/ironic/ironic-pxe-filter/Dockerfile.j2
+++ b/kolla/docker/ironic/ironic-pxe-filter/Dockerfile.j2
diff --git a/docker/ironic/ironic-pxe-filter/extend_start.sh b/kolla/docker/ironic/ironic-pxe-filter/extend_start.sh
index c7a807c8d..c7a807c8d 100644
--- a/docker/ironic/ironic-pxe-filter/extend_start.sh
+++ b/kolla/docker/ironic/ironic-pxe-filter/extend_start.sh
diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/kolla/docker/ironic/ironic-pxe/Dockerfile.j2
index 0475a5b05..0475a5b05 100644
--- a/docker/ironic/ironic-pxe/Dockerfile.j2
+++ b/kolla/docker/ironic/ironic-pxe/Dockerfile.j2
diff --git a/docker/ironic/ironic-pxe/extend_start.sh b/kolla/docker/ironic/ironic-pxe/extend_start.sh
index 06a8312b4..06a8312b4 100644
--- a/docker/ironic/ironic-pxe/extend_start.sh
+++ b/kolla/docker/ironic/ironic-pxe/extend_start.sh
diff --git a/docker/ironic/ironic-pxe/tftp-map-file-template b/kolla/docker/ironic/ironic-pxe/tftp-map-file-template
index 5d3243a7e..5d3243a7e 100644
--- a/docker/ironic/ironic-pxe/tftp-map-file-template
+++ b/kolla/docker/ironic/ironic-pxe/tftp-map-file-template
diff --git a/docker/iscsid/Dockerfile.j2 b/kolla/docker/iscsid/Dockerfile.j2
index a1e4bba61..a1e4bba61 100644
--- a/docker/iscsid/Dockerfile.j2
+++ b/kolla/docker/iscsid/Dockerfile.j2
diff --git a/docker/iscsid/extend_start.sh b/kolla/docker/iscsid/extend_start.sh
index 78f2317d2..78f2317d2 100644
--- a/docker/iscsid/extend_start.sh
+++ b/kolla/docker/iscsid/extend_start.sh
diff --git a/docker/keepalived/Dockerfile.j2 b/kolla/docker/keepalived/Dockerfile.j2
index 2dcdeccd7..2dcdeccd7 100644
--- a/docker/keepalived/Dockerfile.j2
+++ b/kolla/docker/keepalived/Dockerfile.j2
diff --git a/docker/keepalived/check_alive.sh b/kolla/docker/keepalived/check_alive.sh
index 857131123..857131123 100644
--- a/docker/keepalived/check_alive.sh
+++ b/kolla/docker/keepalived/check_alive.sh
diff --git a/docker/keepalived/extend_start.sh b/kolla/docker/keepalived/extend_start.sh
index 889da64fd..889da64fd 100644
--- a/docker/keepalived/extend_start.sh
+++ b/kolla/docker/keepalived/extend_start.sh
diff --git a/docker/kerbside/kerbside-api/Dockerfile.j2 b/kolla/docker/kerbside/kerbside-api/Dockerfile.j2
index 6ea99eb7a..6ea99eb7a 100644
--- a/docker/kerbside/kerbside-api/Dockerfile.j2
+++ b/kolla/docker/kerbside/kerbside-api/Dockerfile.j2
diff --git a/docker/kerbside/kerbside-api/extend_start.sh b/kolla/docker/kerbside/kerbside-api/extend_start.sh
index 92ef80a22..92ef80a22 100644
--- a/docker/kerbside/kerbside-api/extend_start.sh
+++ b/kolla/docker/kerbside/kerbside-api/extend_start.sh
diff --git a/docker/kerbside/kerbside-base/Dockerfile.j2 b/kolla/docker/kerbside/kerbside-base/Dockerfile.j2
index 77f881399..77f881399 100644
--- a/docker/kerbside/kerbside-base/Dockerfile.j2
+++ b/kolla/docker/kerbside/kerbside-base/Dockerfile.j2
diff --git a/docker/kerbside/kerbside-proxy/Dockerfile.j2 b/kolla/docker/kerbside/kerbside-proxy/Dockerfile.j2
index 6ea99eb7a..6ea99eb7a 100644
--- a/docker/kerbside/kerbside-proxy/Dockerfile.j2
+++ b/kolla/docker/kerbside/kerbside-proxy/Dockerfile.j2
diff --git a/docker/kerbside/kerbside-proxy/extend_start.sh b/kolla/docker/kerbside/kerbside-proxy/extend_start.sh
index 92ef80a22..92ef80a22 100644
--- a/docker/kerbside/kerbside-proxy/extend_start.sh
+++ b/kolla/docker/kerbside/kerbside-proxy/extend_start.sh
diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/kolla/docker/keystone/keystone-base/Dockerfile.j2
index faa424fa7..faa424fa7 100644
--- a/docker/keystone/keystone-base/Dockerfile.j2
+++ b/kolla/docker/keystone/keystone-base/Dockerfile.j2
diff --git a/docker/keystone/keystone-fernet/Dockerfile.j2 b/kolla/docker/keystone/keystone-fernet/Dockerfile.j2
index da32ddb86..da32ddb86 100644
--- a/docker/keystone/keystone-fernet/Dockerfile.j2
+++ b/kolla/docker/keystone/keystone-fernet/Dockerfile.j2
diff --git a/docker/keystone/keystone-fernet/extend_start.sh b/kolla/docker/keystone/keystone-fernet/extend_start.sh
index cf356949f..cf356949f 100644
--- a/docker/keystone/keystone-fernet/extend_start.sh
+++ b/kolla/docker/keystone/keystone-fernet/extend_start.sh
diff --git a/docker/keystone/keystone-fernet/fetch_fernet_tokens.py b/kolla/docker/keystone/keystone-fernet/fetch_fernet_tokens.py
index c57943630..c57943630 100644
--- a/docker/keystone/keystone-fernet/fetch_fernet_tokens.py
+++ b/kolla/docker/keystone/keystone-fernet/fetch_fernet_tokens.py
diff --git a/docker/keystone/keystone-fernet/keystone_bootstrap.sh b/kolla/docker/keystone/keystone-fernet/keystone_bootstrap.sh
index d361767bb..d361767bb 100644
--- a/docker/keystone/keystone-fernet/keystone_bootstrap.sh
+++ b/kolla/docker/keystone/keystone-fernet/keystone_bootstrap.sh
diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/kolla/docker/keystone/keystone-ssh/Dockerfile.j2
index af290bd5f..af290bd5f 100644
--- a/docker/keystone/keystone-ssh/Dockerfile.j2
+++ b/kolla/docker/keystone/keystone-ssh/Dockerfile.j2
diff --git a/docker/keystone/keystone-ssh/extend_start.sh b/kolla/docker/keystone/keystone-ssh/extend_start.sh
index 559cd65a9..559cd65a9 100644
--- a/docker/keystone/keystone-ssh/extend_start.sh
+++ b/kolla/docker/keystone/keystone-ssh/extend_start.sh
diff --git a/docker/keystone/keystone/Dockerfile.j2 b/kolla/docker/keystone/keystone/Dockerfile.j2
index 742626c05..742626c05 100644
--- a/docker/keystone/keystone/Dockerfile.j2
+++ b/kolla/docker/keystone/keystone/Dockerfile.j2
diff --git a/docker/keystone/keystone/extend_start.sh b/kolla/docker/keystone/keystone/extend_start.sh
index b45c94d0d..b45c94d0d 100644
--- a/docker/keystone/keystone/extend_start.sh
+++ b/kolla/docker/keystone/keystone/extend_start.sh
diff --git a/docker/keystone/keystone/keystone_bootstrap.sh b/kolla/docker/keystone/keystone/keystone_bootstrap.sh
index 1b04d99b6..1b04d99b6 100644
--- a/docker/keystone/keystone/keystone_bootstrap.sh
+++ b/kolla/docker/keystone/keystone/keystone_bootstrap.sh
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/kolla/docker/kolla-toolbox/Dockerfile.j2
index eac78905d..eac78905d 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/kolla/docker/kolla-toolbox/Dockerfile.j2
diff --git a/docker/kolla-toolbox/ansible.cfg b/kolla/docker/kolla-toolbox/ansible.cfg
index ec505f4a4..ec505f4a4 100644
--- a/docker/kolla-toolbox/ansible.cfg
+++ b/kolla/docker/kolla-toolbox/ansible.cfg
diff --git a/docker/kolla-toolbox/ansible_sudoers b/kolla/docker/kolla-toolbox/ansible_sudoers
index 5a3f109b4..5a3f109b4 100644
--- a/docker/kolla-toolbox/ansible_sudoers
+++ b/kolla/docker/kolla-toolbox/ansible_sudoers
diff --git a/docker/kolla-toolbox/apt_preferences_rabbitmq.debian b/kolla/docker/kolla-toolbox/apt_preferences_rabbitmq.debian
index f1cc84d9b..f1cc84d9b 120000
--- a/docker/kolla-toolbox/apt_preferences_rabbitmq.debian
+++ b/kolla/docker/kolla-toolbox/apt_preferences_rabbitmq.debian
diff --git a/docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu b/kolla/docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu
index 977ded074..977ded074 120000
--- a/docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu
+++ b/kolla/docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu
diff --git a/docker/kolla-toolbox/extend_start.sh b/kolla/docker/kolla-toolbox/extend_start.sh
index 198587145..198587145 100644
--- a/docker/kolla-toolbox/extend_start.sh
+++ b/kolla/docker/kolla-toolbox/extend_start.sh
diff --git a/docker/kolla-toolbox/kolla_toolbox.sh b/kolla/docker/kolla-toolbox/kolla_toolbox.sh
index 5dfd65338..5dfd65338 100644
--- a/docker/kolla-toolbox/kolla_toolbox.sh
+++ b/kolla/docker/kolla-toolbox/kolla_toolbox.sh
diff --git a/docker/kolla-toolbox/requirements.yml b/kolla/docker/kolla-toolbox/requirements.yml
index 83c795142..83c795142 100644
--- a/docker/kolla-toolbox/requirements.yml
+++ b/kolla/docker/kolla-toolbox/requirements.yml
diff --git a/docker/letsencrypt/letsencrypt-base/Dockerfile.j2 b/kolla/docker/letsencrypt/letsencrypt-base/Dockerfile.j2
index 8e9e60db9..8e9e60db9 100644
--- a/docker/letsencrypt/letsencrypt-base/Dockerfile.j2
+++ b/kolla/docker/letsencrypt/letsencrypt-base/Dockerfile.j2
diff --git a/docker/letsencrypt/letsencrypt-base/extend_start.sh b/kolla/docker/letsencrypt/letsencrypt-base/extend_start.sh
index 0300f0b44..0300f0b44 100644
--- a/docker/letsencrypt/letsencrypt-base/extend_start.sh
+++ b/kolla/docker/letsencrypt/letsencrypt-base/extend_start.sh
diff --git a/docker/letsencrypt/letsencrypt-lego/Dockerfile.j2 b/kolla/docker/letsencrypt/letsencrypt-lego/Dockerfile.j2
index b7cda214e..b7cda214e 100755
--- a/docker/letsencrypt/letsencrypt-lego/Dockerfile.j2
+++ b/kolla/docker/letsencrypt/letsencrypt-lego/Dockerfile.j2
diff --git a/docker/letsencrypt/letsencrypt-lego/letsencrypt-certificates.sh b/kolla/docker/letsencrypt/letsencrypt-lego/letsencrypt-certificates.sh
index 83bdede87..83bdede87 100755
--- a/docker/letsencrypt/letsencrypt-lego/letsencrypt-certificates.sh
+++ b/kolla/docker/letsencrypt/letsencrypt-lego/letsencrypt-certificates.sh
diff --git a/docker/letsencrypt/letsencrypt-lego/sync-and-update-certificate.sh b/kolla/docker/letsencrypt/letsencrypt-lego/sync-and-update-certificate.sh
index e1e421c46..e1e421c46 100644
--- a/docker/letsencrypt/letsencrypt-lego/sync-and-update-certificate.sh
+++ b/kolla/docker/letsencrypt/letsencrypt-lego/sync-and-update-certificate.sh
diff --git a/docker/macros.j2 b/kolla/docker/macros.j2
index 34d67335c..34d67335c 100644
--- a/docker/macros.j2
+++ b/kolla/docker/macros.j2
diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/kolla/docker/magnum/magnum-api/Dockerfile.j2
index 304b54e20..304b54e20 100644
--- a/docker/magnum/magnum-api/Dockerfile.j2
+++ b/kolla/docker/magnum/magnum-api/Dockerfile.j2
diff --git a/docker/magnum/magnum-api/extend_start.sh b/kolla/docker/magnum/magnum-api/extend_start.sh
index 0f92f6e7b..0f92f6e7b 100644
--- a/docker/magnum/magnum-api/extend_start.sh
+++ b/kolla/docker/magnum/magnum-api/extend_start.sh
diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/kolla/docker/magnum/magnum-base/Dockerfile.j2
index ac17b94b4..ac17b94b4 100644
--- a/docker/magnum/magnum-base/Dockerfile.j2
+++ b/kolla/docker/magnum/magnum-base/Dockerfile.j2
diff --git a/docker/magnum/magnum-base/extend_start.sh b/kolla/docker/magnum/magnum-base/extend_start.sh
index 2e58c9776..2e58c9776 100644
--- a/docker/magnum/magnum-base/extend_start.sh
+++ b/kolla/docker/magnum/magnum-base/extend_start.sh
diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/kolla/docker/magnum/magnum-conductor/Dockerfile.j2
index 6e2df8fed..6e2df8fed 100644
--- a/docker/magnum/magnum-conductor/Dockerfile.j2
+++ b/kolla/docker/magnum/magnum-conductor/Dockerfile.j2
diff --git a/docker/manila/manila-api/Dockerfile.j2 b/kolla/docker/manila/manila-api/Dockerfile.j2
index d7b75d388..d7b75d388 100644
--- a/docker/manila/manila-api/Dockerfile.j2
+++ b/kolla/docker/manila/manila-api/Dockerfile.j2
diff --git a/docker/manila/manila-api/extend_start.sh b/kolla/docker/manila/manila-api/extend_start.sh
index bea77dbba..bea77dbba 100644
--- a/docker/manila/manila-api/extend_start.sh
+++ b/kolla/docker/manila/manila-api/extend_start.sh
diff --git a/docker/manila/manila-base/Dockerfile.j2 b/kolla/docker/manila/manila-base/Dockerfile.j2
index a236a20df..a236a20df 100644
--- a/docker/manila/manila-base/Dockerfile.j2
+++ b/kolla/docker/manila/manila-base/Dockerfile.j2
diff --git a/docker/manila/manila-base/extend_start.sh b/kolla/docker/manila/manila-base/extend_start.sh
index c018416a3..c018416a3 100644
--- a/docker/manila/manila-base/extend_start.sh
+++ b/kolla/docker/manila/manila-base/extend_start.sh
diff --git a/docker/manila/manila-base/manila_sudoers b/kolla/docker/manila/manila-base/manila_sudoers
index 623e6789b..623e6789b 100644
--- a/docker/manila/manila-base/manila_sudoers
+++ b/kolla/docker/manila/manila-base/manila_sudoers
diff --git a/docker/manila/manila-data/Dockerfile.j2 b/kolla/docker/manila/manila-data/Dockerfile.j2
index 06e1d9dc9..06e1d9dc9 100644
--- a/docker/manila/manila-data/Dockerfile.j2
+++ b/kolla/docker/manila/manila-data/Dockerfile.j2
diff --git a/docker/manila/manila-scheduler/Dockerfile.j2 b/kolla/docker/manila/manila-scheduler/Dockerfile.j2
index 12f7860f4..12f7860f4 100644
--- a/docker/manila/manila-scheduler/Dockerfile.j2
+++ b/kolla/docker/manila/manila-scheduler/Dockerfile.j2
diff --git a/docker/manila/manila-share/Dockerfile.j2 b/kolla/docker/manila/manila-share/Dockerfile.j2
index 161b6865a..161b6865a 100644
--- a/docker/manila/manila-share/Dockerfile.j2
+++ b/kolla/docker/manila/manila-share/Dockerfile.j2
diff --git a/docker/mariadb-server/Dockerfile.j2 b/kolla/docker/mariadb-server/Dockerfile.j2
index 612b37330..612b37330 100644
--- a/docker/mariadb-server/Dockerfile.j2
+++ b/kolla/docker/mariadb-server/Dockerfile.j2
diff --git a/docker/mariadb-server/backup.sh b/kolla/docker/mariadb-server/backup.sh
index be63cd938..be63cd938 100644
--- a/docker/mariadb-server/backup.sh
+++ b/kolla/docker/mariadb-server/backup.sh
diff --git a/docker/mariadb-server/backup_replica.sh b/kolla/docker/mariadb-server/backup_replica.sh
index fe10bc61b..fe10bc61b 100644
--- a/docker/mariadb-server/backup_replica.sh
+++ b/kolla/docker/mariadb-server/backup_replica.sh
diff --git a/docker/mariadb-server/extend_start.sh b/kolla/docker/mariadb-server/extend_start.sh
index f14c85949..f14c85949 100644
--- a/docker/mariadb-server/extend_start.sh
+++ b/kolla/docker/mariadb-server/extend_start.sh
diff --git a/docker/mariadb-server/healthcheck_mariadb b/kolla/docker/mariadb-server/healthcheck_mariadb
index 0d9f59a95..0d9f59a95 100755
--- a/docker/mariadb-server/healthcheck_mariadb
+++ b/kolla/docker/mariadb-server/healthcheck_mariadb
diff --git a/docker/mariadb-server/mariadb_sudoers b/kolla/docker/mariadb-server/mariadb_sudoers
index 150534e16..150534e16 100644
--- a/docker/mariadb-server/mariadb_sudoers
+++ b/kolla/docker/mariadb-server/mariadb_sudoers
diff --git a/docker/mariadb-server/security_reset.expect b/kolla/docker/mariadb-server/security_reset.expect
index 06f1d5c8e..06f1d5c8e 100644
--- a/docker/mariadb-server/security_reset.expect
+++ b/kolla/docker/mariadb-server/security_reset.expect
diff --git a/docker/masakari/masakari-api/Dockerfile.j2 b/kolla/docker/masakari/masakari-api/Dockerfile.j2
index 5285c6a36..5285c6a36 100644
--- a/docker/masakari/masakari-api/Dockerfile.j2
+++ b/kolla/docker/masakari/masakari-api/Dockerfile.j2
diff --git a/docker/masakari/masakari-api/extend_start.sh b/kolla/docker/masakari/masakari-api/extend_start.sh
index 549759f49..549759f49 100755
--- a/docker/masakari/masakari-api/extend_start.sh
+++ b/kolla/docker/masakari/masakari-api/extend_start.sh
diff --git a/docker/masakari/masakari-base/Dockerfile.j2 b/kolla/docker/masakari/masakari-base/Dockerfile.j2
index 97e31247e..97e31247e 100644
--- a/docker/masakari/masakari-base/Dockerfile.j2
+++ b/kolla/docker/masakari/masakari-base/Dockerfile.j2
diff --git a/docker/masakari/masakari-base/extend_start.sh b/kolla/docker/masakari/masakari-base/extend_start.sh
index 4f13d3e8b..4f13d3e8b 100755
--- a/docker/masakari/masakari-base/extend_start.sh
+++ b/kolla/docker/masakari/masakari-base/extend_start.sh
diff --git a/docker/masakari/masakari-engine/Dockerfile.j2 b/kolla/docker/masakari/masakari-engine/Dockerfile.j2
index 8dfb3175c..8dfb3175c 100644
--- a/docker/masakari/masakari-engine/Dockerfile.j2
+++ b/kolla/docker/masakari/masakari-engine/Dockerfile.j2
diff --git a/docker/masakari/masakari-monitors/Dockerfile.j2 b/kolla/docker/masakari/masakari-monitors/Dockerfile.j2
index 92b8c3947..92b8c3947 100644
--- a/docker/masakari/masakari-monitors/Dockerfile.j2
+++ b/kolla/docker/masakari/masakari-monitors/Dockerfile.j2
diff --git a/docker/masakari/masakari-monitors/masakari_monitors_sudoers b/kolla/docker/masakari/masakari-monitors/masakari_monitors_sudoers
index be3867b5c..be3867b5c 100644
--- a/docker/masakari/masakari-monitors/masakari_monitors_sudoers
+++ b/kolla/docker/masakari/masakari-monitors/masakari_monitors_sudoers
diff --git a/docker/memcached/Dockerfile.j2 b/kolla/docker/memcached/Dockerfile.j2
index dfe90b18e..dfe90b18e 100644
--- a/docker/memcached/Dockerfile.j2
+++ b/kolla/docker/memcached/Dockerfile.j2
diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/kolla/docker/mistral/mistral-api/Dockerfile.j2
index be3e431e1..be3e431e1 100644
--- a/docker/mistral/mistral-api/Dockerfile.j2
+++ b/kolla/docker/mistral/mistral-api/Dockerfile.j2
diff --git a/docker/mistral/mistral-api/extend_start.sh b/kolla/docker/mistral/mistral-api/extend_start.sh
index 113adb8a2..113adb8a2 100644
--- a/docker/mistral/mistral-api/extend_start.sh
+++ b/kolla/docker/mistral/mistral-api/extend_start.sh
diff --git a/docker/mistral/mistral-base/Dockerfile.j2 b/kolla/docker/mistral/mistral-base/Dockerfile.j2
index 1d72c1cac..1d72c1cac 100644
--- a/docker/mistral/mistral-base/Dockerfile.j2
+++ b/kolla/docker/mistral/mistral-base/Dockerfile.j2
diff --git a/docker/mistral/mistral-base/extend_start.sh b/kolla/docker/mistral/mistral-base/extend_start.sh
index ac2980d6c..ac2980d6c 100644
--- a/docker/mistral/mistral-base/extend_start.sh
+++ b/kolla/docker/mistral/mistral-base/extend_start.sh
diff --git a/docker/mistral/mistral-engine/Dockerfile.j2 b/kolla/docker/mistral/mistral-engine/Dockerfile.j2
index c5fd5eb0d..c5fd5eb0d 100644
--- a/docker/mistral/mistral-engine/Dockerfile.j2
+++ b/kolla/docker/mistral/mistral-engine/Dockerfile.j2
diff --git a/docker/mistral/mistral-event-engine/Dockerfile.j2 b/kolla/docker/mistral/mistral-event-engine/Dockerfile.j2
index 2a05ecf76..2a05ecf76 100644
--- a/docker/mistral/mistral-event-engine/Dockerfile.j2
+++ b/kolla/docker/mistral/mistral-event-engine/Dockerfile.j2
diff --git a/docker/mistral/mistral-executor/Dockerfile.j2 b/kolla/docker/mistral/mistral-executor/Dockerfile.j2
index aeae9ed06..aeae9ed06 100644
--- a/docker/mistral/mistral-executor/Dockerfile.j2
+++ b/kolla/docker/mistral/mistral-executor/Dockerfile.j2
diff --git a/docker/multipathd/Dockerfile.j2 b/kolla/docker/multipathd/Dockerfile.j2
index 1341c62a7..1341c62a7 100644
--- a/docker/multipathd/Dockerfile.j2
+++ b/kolla/docker/multipathd/Dockerfile.j2
diff --git a/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 b/kolla/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2
index a7ae6ccb4..a7ae6ccb4 100644
--- a/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2
+++ b/kolla/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/kolla/docker/neutron/neutron-base/Dockerfile.j2
index e91c1e6e6..e91c1e6e6 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/kolla/docker/neutron/neutron-base/Dockerfile.j2
diff --git a/docker/neutron/neutron-base/copy-wrappers b/kolla/docker/neutron/neutron-base/copy-wrappers
index e03bdfdf7..e03bdfdf7 100644
--- a/docker/neutron/neutron-base/copy-wrappers
+++ b/kolla/docker/neutron/neutron-base/copy-wrappers
diff --git a/docker/neutron/neutron-base/delete-wrappers b/kolla/docker/neutron/neutron-base/delete-wrappers
index 239d977f2..239d977f2 100644
--- a/docker/neutron/neutron-base/delete-wrappers
+++ b/kolla/docker/neutron/neutron-base/delete-wrappers
diff --git a/docker/neutron/neutron-base/dnsmasq b/kolla/docker/neutron/neutron-base/dnsmasq
index 44b73f0b2..44b73f0b2 100644
--- a/docker/neutron/neutron-base/dnsmasq
+++ b/kolla/docker/neutron/neutron-base/dnsmasq
diff --git a/docker/neutron/neutron-base/extend_start.sh b/kolla/docker/neutron/neutron-base/extend_start.sh
index e2a2dfca4..e2a2dfca4 100644
--- a/docker/neutron/neutron-base/extend_start.sh
+++ b/kolla/docker/neutron/neutron-base/extend_start.sh
diff --git a/docker/neutron/neutron-base/haproxy b/kolla/docker/neutron/neutron-base/haproxy
index 43b9ef9d2..43b9ef9d2 100644
--- a/docker/neutron/neutron-base/haproxy
+++ b/kolla/docker/neutron/neutron-base/haproxy
diff --git a/docker/neutron/neutron-base/keepalived b/kolla/docker/neutron/neutron-base/keepalived
index 6bb2b4d3d..6bb2b4d3d 100644
--- a/docker/neutron/neutron-base/keepalived
+++ b/kolla/docker/neutron/neutron-base/keepalived
diff --git a/docker/neutron/neutron-base/neutron-keepalived-state-change b/kolla/docker/neutron/neutron-base/neutron-keepalived-state-change
index 0b30d88cf..0b30d88cf 100644
--- a/docker/neutron/neutron-base/neutron-keepalived-state-change
+++ b/kolla/docker/neutron/neutron-base/neutron-keepalived-state-change
diff --git a/docker/neutron/neutron-base/neutron_sudoers b/kolla/docker/neutron/neutron-base/neutron_sudoers
index d0de94f0e..d0de94f0e 100644
--- a/docker/neutron/neutron-base/neutron_sudoers
+++ b/kolla/docker/neutron/neutron-base/neutron_sudoers
diff --git a/docker/neutron/neutron-base/radvd b/kolla/docker/neutron/neutron-base/radvd
index 3f5dd1cfa..3f5dd1cfa 100644
--- a/docker/neutron/neutron-base/radvd
+++ b/kolla/docker/neutron/neutron-base/radvd
diff --git a/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 b/kolla/docker/neutron/neutron-bgp-dragent/Dockerfile.j2
index 3ad2ab596..3ad2ab596 100644
--- a/docker/neutron/neutron-bgp-dragent/Dockerfile.j2
+++ b/kolla/docker/neutron/neutron-bgp-dragent/Dockerfile.j2
diff --git a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 b/kolla/docker/neutron/neutron-dhcp-agent/Dockerfile.j2
index 035433bf2..035433bf2 100644
--- a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2
+++ b/kolla/docker/neutron/neutron-dhcp-agent/Dockerfile.j2
diff --git a/docker/neutron/neutron-dhcp-agent/extend_start.sh b/kolla/docker/neutron/neutron-dhcp-agent/extend_start.sh
index edaad2a3a..edaad2a3a 100644
--- a/docker/neutron/neutron-dhcp-agent/extend_start.sh
+++ b/kolla/docker/neutron/neutron-dhcp-agent/extend_start.sh
diff --git a/docker/neutron/neutron-l3-agent/Dockerfile.j2 b/kolla/docker/neutron/neutron-l3-agent/Dockerfile.j2
index ae0457c18..ae0457c18 100644
--- a/docker/neutron/neutron-l3-agent/Dockerfile.j2
+++ b/kolla/docker/neutron/neutron-l3-agent/Dockerfile.j2
diff --git a/docker/neutron/neutron-l3-agent/extend_start.sh b/kolla/docker/neutron/neutron-l3-agent/extend_start.sh
index f95c1eda2..f95c1eda2 100644
--- a/docker/neutron/neutron-l3-agent/extend_start.sh
+++ b/kolla/docker/neutron/neutron-l3-agent/extend_start.sh
diff --git a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 b/kolla/docker/neutron/neutron-metadata-agent/Dockerfile.j2
index 3736f70c8..3736f70c8 100644
--- a/docker/neutron/neutron-metadata-agent/Dockerfile.j2
+++ b/kolla/docker/neutron/neutron-metadata-agent/Dockerfile.j2
diff --git a/docker/neutron/neutron-metadata-agent/extend_start.sh b/kolla/docker/neutron/neutron-metadata-agent/extend_start.sh
index 001898f68..001898f68 100644
--- a/docker/neutron/neutron-metadata-agent/extend_start.sh
+++ b/kolla/docker/neutron/neutron-metadata-agent/extend_start.sh
diff --git a/docker/neutron/neutron-metering-agent/Dockerfile.j2 b/kolla/docker/neutron/neutron-metering-agent/Dockerfile.j2
index e9d7f74e0..e9d7f74e0 100644
--- a/docker/neutron/neutron-metering-agent/Dockerfile.j2
+++ b/kolla/docker/neutron/neutron-metering-agent/Dockerfile.j2
diff --git a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 b/kolla/docker/neutron/neutron-mlnx-agent/Dockerfile.j2
index 4ee89c19a..4ee89c19a 100644
--- a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2
+++ b/kolla/docker/neutron/neutron-mlnx-agent/Dockerfile.j2
diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/kolla/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
index b9499e6f7..b9499e6f7 100644
--- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
+++ b/kolla/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
diff --git a/docker/neutron/neutron-ovn-agent/Dockerfile.j2 b/kolla/docker/neutron/neutron-ovn-agent/Dockerfile.j2
index fe4e352ac..fe4e352ac 100644
--- a/docker/neutron/neutron-ovn-agent/Dockerfile.j2
+++ b/kolla/docker/neutron/neutron-ovn-agent/Dockerfile.j2
diff --git a/docker/neutron/neutron-ovn-vpn-agent/Dockerfile.j2 b/kolla/docker/neutron/neutron-ovn-vpn-agent/Dockerfile.j2
index 4fbaaa78f..4fbaaa78f 100644
--- a/docker/neutron/neutron-ovn-vpn-agent/Dockerfile.j2
+++ b/kolla/docker/neutron/neutron-ovn-vpn-agent/Dockerfile.j2
diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/kolla/docker/neutron/neutron-server/Dockerfile.j2
index bda0d3dcf..bda0d3dcf 100644
--- a/docker/neutron/neutron-server/Dockerfile.j2
+++ b/kolla/docker/neutron/neutron-server/Dockerfile.j2
diff --git a/docker/neutron/neutron-server/extend_start.sh b/kolla/docker/neutron/neutron-server/extend_start.sh
index 630eb6e1f..630eb6e1f 100644
--- a/docker/neutron/neutron-server/extend_start.sh
+++ b/kolla/docker/neutron/neutron-server/extend_start.sh
diff --git a/docker/neutron/neutron-sriov-agent/Dockerfile.j2 b/kolla/docker/neutron/neutron-sriov-agent/Dockerfile.j2
index c5d74fbb2..c5d74fbb2 100644
--- a/docker/neutron/neutron-sriov-agent/Dockerfile.j2
+++ b/kolla/docker/neutron/neutron-sriov-agent/Dockerfile.j2
diff --git a/docker/nova/nova-api/Dockerfile.j2 b/kolla/docker/nova/nova-api/Dockerfile.j2
index 57846af79..57846af79 100644
--- a/docker/nova/nova-api/Dockerfile.j2
+++ b/kolla/docker/nova/nova-api/Dockerfile.j2
diff --git a/docker/nova/nova-api/extend_start.sh b/kolla/docker/nova/nova-api/extend_start.sh
index ead6c252b..ead6c252b 100644
--- a/docker/nova/nova-api/extend_start.sh
+++ b/kolla/docker/nova/nova-api/extend_start.sh
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/kolla/docker/nova/nova-base/Dockerfile.j2
index 423a9760a..423a9760a 100644
--- a/docker/nova/nova-base/Dockerfile.j2
+++ b/kolla/docker/nova/nova-base/Dockerfile.j2
diff --git a/docker/nova/nova-base/extend_start.sh b/kolla/docker/nova/nova-base/extend_start.sh
index eee0f16a1..eee0f16a1 100644
--- a/docker/nova/nova-base/extend_start.sh
+++ b/kolla/docker/nova/nova-base/extend_start.sh
diff --git a/docker/nova/nova-base/nova_sudoers b/kolla/docker/nova/nova-base/nova_sudoers
index 6d73da6d3..6d73da6d3 100644
--- a/docker/nova/nova-base/nova_sudoers
+++ b/kolla/docker/nova/nova-base/nova_sudoers
diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/kolla/docker/nova/nova-compute-ironic/Dockerfile.j2
index 3c455e2ec..3c455e2ec 100644
--- a/docker/nova/nova-compute-ironic/Dockerfile.j2
+++ b/kolla/docker/nova/nova-compute-ironic/Dockerfile.j2
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/kolla/docker/nova/nova-compute/Dockerfile.j2
index 8b3c1bcfe..8b3c1bcfe 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/kolla/docker/nova/nova-compute/Dockerfile.j2
diff --git a/docker/nova/nova-compute/extend_start.sh b/kolla/docker/nova/nova-compute/extend_start.sh
index a458625ec..a458625ec 100644
--- a/docker/nova/nova-compute/extend_start.sh
+++ b/kolla/docker/nova/nova-compute/extend_start.sh
diff --git a/docker/nova/nova-conductor/Dockerfile.j2 b/kolla/docker/nova/nova-conductor/Dockerfile.j2
index b14000400..b14000400 100644
--- a/docker/nova/nova-conductor/Dockerfile.j2
+++ b/kolla/docker/nova/nova-conductor/Dockerfile.j2
diff --git a/docker/nova/nova-conductor/extend_start.sh b/kolla/docker/nova/nova-conductor/extend_start.sh
index 72c9493f5..72c9493f5 100644
--- a/docker/nova/nova-conductor/extend_start.sh
+++ b/kolla/docker/nova/nova-conductor/extend_start.sh
diff --git a/docker/nova/nova-libvirt-spice/Dockerfile.j2 b/kolla/docker/nova/nova-libvirt-spice/Dockerfile.j2
index 4c7ded894..4c7ded894 100644
--- a/docker/nova/nova-libvirt-spice/Dockerfile.j2
+++ b/kolla/docker/nova/nova-libvirt-spice/Dockerfile.j2
diff --git a/docker/nova/nova-libvirt-spice/extend_start.sh b/kolla/docker/nova/nova-libvirt-spice/extend_start.sh
index cc41b480b..cc41b480b 100644
--- a/docker/nova/nova-libvirt-spice/extend_start.sh
+++ b/kolla/docker/nova/nova-libvirt-spice/extend_start.sh
diff --git a/docker/nova/nova-libvirt-spice/kolla_nova_libvirt_start.sh b/kolla/docker/nova/nova-libvirt-spice/kolla_nova_libvirt_start.sh
index f06a63d9e..f06a63d9e 100644
--- a/docker/nova/nova-libvirt-spice/kolla_nova_libvirt_start.sh
+++ b/kolla/docker/nova/nova-libvirt-spice/kolla_nova_libvirt_start.sh
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/kolla/docker/nova/nova-libvirt/Dockerfile.j2
index fb82401b3..fb82401b3 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/kolla/docker/nova/nova-libvirt/Dockerfile.j2
diff --git a/docker/nova/nova-libvirt/extend_start.sh b/kolla/docker/nova/nova-libvirt/extend_start.sh
index cc41b480b..cc41b480b 100644
--- a/docker/nova/nova-libvirt/extend_start.sh
+++ b/kolla/docker/nova/nova-libvirt/extend_start.sh
diff --git a/docker/nova/nova-libvirt/kolla_nova_libvirt_start.sh b/kolla/docker/nova/nova-libvirt/kolla_nova_libvirt_start.sh
index f06a63d9e..f06a63d9e 100644
--- a/docker/nova/nova-libvirt/kolla_nova_libvirt_start.sh
+++ b/kolla/docker/nova/nova-libvirt/kolla_nova_libvirt_start.sh
diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/kolla/docker/nova/nova-novncproxy/Dockerfile.j2
index 4952ed734..4952ed734 100644
--- a/docker/nova/nova-novncproxy/Dockerfile.j2
+++ b/kolla/docker/nova/nova-novncproxy/Dockerfile.j2
diff --git a/docker/nova/nova-scheduler/Dockerfile.j2 b/kolla/docker/nova/nova-scheduler/Dockerfile.j2
index 5b0b0b98e..5b0b0b98e 100644
--- a/docker/nova/nova-scheduler/Dockerfile.j2
+++ b/kolla/docker/nova/nova-scheduler/Dockerfile.j2
diff --git a/docker/nova/nova-serialproxy/Dockerfile.j2 b/kolla/docker/nova/nova-serialproxy/Dockerfile.j2
index c63e925d5..c63e925d5 100644
--- a/docker/nova/nova-serialproxy/Dockerfile.j2
+++ b/kolla/docker/nova/nova-serialproxy/Dockerfile.j2
diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/kolla/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
index f3a90b0c5..f3a90b0c5 100644
--- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
+++ b/kolla/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/kolla/docker/nova/nova-ssh/Dockerfile.j2
index 0d9e36b65..0d9e36b65 100644
--- a/docker/nova/nova-ssh/Dockerfile.j2
+++ b/kolla/docker/nova/nova-ssh/Dockerfile.j2
diff --git a/docker/nova/nova-ssh/extend_start.sh b/kolla/docker/nova/nova-ssh/extend_start.sh
index b80114c0a..b80114c0a 100644
--- a/docker/nova/nova-ssh/extend_start.sh
+++ b/kolla/docker/nova/nova-ssh/extend_start.sh
diff --git a/docker/octavia/octavia-api/Dockerfile.j2 b/kolla/docker/octavia/octavia-api/Dockerfile.j2
index ccb7bad11..ccb7bad11 100644
--- a/docker/octavia/octavia-api/Dockerfile.j2
+++ b/kolla/docker/octavia/octavia-api/Dockerfile.j2
diff --git a/docker/octavia/octavia-api/extend_start.sh b/kolla/docker/octavia/octavia-api/extend_start.sh
index b05d8abf1..b05d8abf1 100644
--- a/docker/octavia/octavia-api/extend_start.sh
+++ b/kolla/docker/octavia/octavia-api/extend_start.sh
diff --git a/docker/octavia/octavia-base/Dockerfile.j2 b/kolla/docker/octavia/octavia-base/Dockerfile.j2
index 81a589a09..81a589a09 100644
--- a/docker/octavia/octavia-base/Dockerfile.j2
+++ b/kolla/docker/octavia/octavia-base/Dockerfile.j2
diff --git a/docker/octavia/octavia-base/extend_start.sh b/kolla/docker/octavia/octavia-base/extend_start.sh
index b27a88a31..b27a88a31 100644
--- a/docker/octavia/octavia-base/extend_start.sh
+++ b/kolla/docker/octavia/octavia-base/extend_start.sh
diff --git a/docker/octavia/octavia-driver-agent/Dockerfile.j2 b/kolla/docker/octavia/octavia-driver-agent/Dockerfile.j2
index b3519922a..b3519922a 100644
--- a/docker/octavia/octavia-driver-agent/Dockerfile.j2
+++ b/kolla/docker/octavia/octavia-driver-agent/Dockerfile.j2
diff --git a/docker/octavia/octavia-health-manager/Dockerfile.j2 b/kolla/docker/octavia/octavia-health-manager/Dockerfile.j2
index 1ffbe2050..1ffbe2050 100644
--- a/docker/octavia/octavia-health-manager/Dockerfile.j2
+++ b/kolla/docker/octavia/octavia-health-manager/Dockerfile.j2
diff --git a/docker/octavia/octavia-housekeeping/Dockerfile.j2 b/kolla/docker/octavia/octavia-housekeeping/Dockerfile.j2
index 775797cca..775797cca 100644
--- a/docker/octavia/octavia-housekeeping/Dockerfile.j2
+++ b/kolla/docker/octavia/octavia-housekeeping/Dockerfile.j2
diff --git a/docker/octavia/octavia-worker/Dockerfile.j2 b/kolla/docker/octavia/octavia-worker/Dockerfile.j2
index 85d4727b7..85d4727b7 100644
--- a/docker/octavia/octavia-worker/Dockerfile.j2
+++ b/kolla/docker/octavia/octavia-worker/Dockerfile.j2
diff --git a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 b/kolla/docker/opensearch/opensearch-dashboards/Dockerfile.j2
index 3249b62d2..3249b62d2 100644
--- a/docker/opensearch/opensearch-dashboards/Dockerfile.j2
+++ b/kolla/docker/opensearch/opensearch-dashboards/Dockerfile.j2
diff --git a/docker/opensearch/opensearch-dashboards/extend_start.sh b/kolla/docker/opensearch/opensearch-dashboards/extend_start.sh
index 608bb34bf..608bb34bf 100644
--- a/docker/opensearch/opensearch-dashboards/extend_start.sh
+++ b/kolla/docker/opensearch/opensearch-dashboards/extend_start.sh
diff --git a/docker/opensearch/opensearch/Dockerfile.j2 b/kolla/docker/opensearch/opensearch/Dockerfile.j2
index 6ad8fb29a..6ad8fb29a 100644
--- a/docker/opensearch/opensearch/Dockerfile.j2
+++ b/kolla/docker/opensearch/opensearch/Dockerfile.j2
diff --git a/docker/opensearch/opensearch/extend_start.sh b/kolla/docker/opensearch/opensearch/extend_start.sh
index 5855b1be2..5855b1be2 100644
--- a/docker/opensearch/opensearch/extend_start.sh
+++ b/kolla/docker/opensearch/opensearch/extend_start.sh
diff --git a/docker/openstack-base/Dockerfile.j2 b/kolla/docker/openstack-base/Dockerfile.j2
index b8ed2e465..b8ed2e465 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/kolla/docker/openstack-base/Dockerfile.j2
diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/kolla/docker/openvswitch/openvswitch-base/Dockerfile.j2
index 44d8df41c..44d8df41c 100644
--- a/docker/openvswitch/openvswitch-base/Dockerfile.j2
+++ b/kolla/docker/openvswitch/openvswitch-base/Dockerfile.j2
diff --git a/docker/openvswitch/openvswitch-base/extend_start.sh b/kolla/docker/openvswitch/openvswitch-base/extend_start.sh
index 1b0ed1300..1b0ed1300 100644
--- a/docker/openvswitch/openvswitch-base/extend_start.sh
+++ b/kolla/docker/openvswitch/openvswitch-base/extend_start.sh
diff --git a/docker/openvswitch/openvswitch-base/ovs_wrapper.sh b/kolla/docker/openvswitch/openvswitch-base/ovs_wrapper.sh
index 552c496ac..552c496ac 100644
--- a/docker/openvswitch/openvswitch-base/ovs_wrapper.sh
+++ b/kolla/docker/openvswitch/openvswitch-base/ovs_wrapper.sh
diff --git a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/kolla/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
index 869dbabb6..869dbabb6 100644
--- a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
+++ b/kolla/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
diff --git a/docker/openvswitch/openvswitch-db-server/extend_start.sh b/kolla/docker/openvswitch/openvswitch-db-server/extend_start.sh
index d25038bdd..d25038bdd 100644
--- a/docker/openvswitch/openvswitch-db-server/extend_start.sh
+++ b/kolla/docker/openvswitch/openvswitch-db-server/extend_start.sh
diff --git a/docker/openvswitch/openvswitch-db-server/releasenotes/notes/drop-ovs-ensure-configured-7973d36969e157fa.yaml b/kolla/docker/openvswitch/openvswitch-db-server/releasenotes/notes/drop-ovs-ensure-configured-7973d36969e157fa.yaml
index cc8daf1f4..cc8daf1f4 100644
--- a/docker/openvswitch/openvswitch-db-server/releasenotes/notes/drop-ovs-ensure-configured-7973d36969e157fa.yaml
+++ b/kolla/docker/openvswitch/openvswitch-db-server/releasenotes/notes/drop-ovs-ensure-configured-7973d36969e157fa.yaml
diff --git a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/kolla/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
index fe6dd4347..fe6dd4347 100644
--- a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
+++ b/kolla/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
diff --git a/docker/openvswitch/openvswitch-vswitchd/extend_start.sh b/kolla/docker/openvswitch/openvswitch-vswitchd/extend_start.sh
index fde542130..fde542130 100644
--- a/docker/openvswitch/openvswitch-vswitchd/extend_start.sh
+++ b/kolla/docker/openvswitch/openvswitch-vswitchd/extend_start.sh
diff --git a/docker/ovn/ovn-base/Dockerfile.j2 b/kolla/docker/ovn/ovn-base/Dockerfile.j2
index 3efd001a3..3efd001a3 100644
--- a/docker/ovn/ovn-base/Dockerfile.j2
+++ b/kolla/docker/ovn/ovn-base/Dockerfile.j2
diff --git a/docker/ovn/ovn-base/extend_start.sh b/kolla/docker/ovn/ovn-base/extend_start.sh
index eae4ab9e1..eae4ab9e1 100644
--- a/docker/ovn/ovn-base/extend_start.sh
+++ b/kolla/docker/ovn/ovn-base/extend_start.sh
diff --git a/docker/ovn/ovn-controller/Dockerfile.j2 b/kolla/docker/ovn/ovn-controller/Dockerfile.j2
index f95e61fee..f95e61fee 100644
--- a/docker/ovn/ovn-controller/Dockerfile.j2
+++ b/kolla/docker/ovn/ovn-controller/Dockerfile.j2
diff --git a/docker/ovn/ovn-controller/extend_start.sh b/kolla/docker/ovn/ovn-controller/extend_start.sh
index 8080ea7c8..8080ea7c8 100644
--- a/docker/ovn/ovn-controller/extend_start.sh
+++ b/kolla/docker/ovn/ovn-controller/extend_start.sh
diff --git a/docker/ovn/ovn-nb-db-server/Dockerfile.j2 b/kolla/docker/ovn/ovn-nb-db-server/Dockerfile.j2
index ea6a53249..ea6a53249 100644
--- a/docker/ovn/ovn-nb-db-server/Dockerfile.j2
+++ b/kolla/docker/ovn/ovn-nb-db-server/Dockerfile.j2
diff --git a/docker/ovn/ovn-nb-db-server/extend_start.sh b/kolla/docker/ovn/ovn-nb-db-server/extend_start.sh
index 4c0e742f5..4c0e742f5 100644
--- a/docker/ovn/ovn-nb-db-server/extend_start.sh
+++ b/kolla/docker/ovn/ovn-nb-db-server/extend_start.sh
diff --git a/docker/ovn/ovn-nb-db-server/start_nb_db_server.sh b/kolla/docker/ovn/ovn-nb-db-server/start_nb_db_server.sh
index d08dd2890..d08dd2890 100755
--- a/docker/ovn/ovn-nb-db-server/start_nb_db_server.sh
+++ b/kolla/docker/ovn/ovn-nb-db-server/start_nb_db_server.sh
diff --git a/docker/ovn/ovn-northd/Dockerfile.j2 b/kolla/docker/ovn/ovn-northd/Dockerfile.j2
index 4a15e10eb..4a15e10eb 100644
--- a/docker/ovn/ovn-northd/Dockerfile.j2
+++ b/kolla/docker/ovn/ovn-northd/Dockerfile.j2
diff --git a/docker/ovn/ovn-northd/extend_start.sh b/kolla/docker/ovn/ovn-northd/extend_start.sh
index c832c5383..c832c5383 100644
--- a/docker/ovn/ovn-northd/extend_start.sh
+++ b/kolla/docker/ovn/ovn-northd/extend_start.sh
diff --git a/docker/ovn/ovn-sb-db-relay/Dockerfile.j2 b/kolla/docker/ovn/ovn-sb-db-relay/Dockerfile.j2
index 427b6f7f1..427b6f7f1 100644
--- a/docker/ovn/ovn-sb-db-relay/Dockerfile.j2
+++ b/kolla/docker/ovn/ovn-sb-db-relay/Dockerfile.j2
diff --git a/docker/ovn/ovn-sb-db-relay/extend_start.sh b/kolla/docker/ovn/ovn-sb-db-relay/extend_start.sh
index 04b6c5357..04b6c5357 100644
--- a/docker/ovn/ovn-sb-db-relay/extend_start.sh
+++ b/kolla/docker/ovn/ovn-sb-db-relay/extend_start.sh
diff --git a/docker/ovn/ovn-sb-db-server/Dockerfile.j2 b/kolla/docker/ovn/ovn-sb-db-server/Dockerfile.j2
index afceb8173..afceb8173 100644
--- a/docker/ovn/ovn-sb-db-server/Dockerfile.j2
+++ b/kolla/docker/ovn/ovn-sb-db-server/Dockerfile.j2
diff --git a/docker/ovn/ovn-sb-db-server/extend_start.sh b/kolla/docker/ovn/ovn-sb-db-server/extend_start.sh
index 07bcd1b45..07bcd1b45 100644
--- a/docker/ovn/ovn-sb-db-server/extend_start.sh
+++ b/kolla/docker/ovn/ovn-sb-db-server/extend_start.sh
diff --git a/docker/ovn/ovn-sb-db-server/start_sb_db_server.sh b/kolla/docker/ovn/ovn-sb-db-server/start_sb_db_server.sh
index ef39b8d25..ef39b8d25 100755
--- a/docker/ovn/ovn-sb-db-server/start_sb_db_server.sh
+++ b/kolla/docker/ovn/ovn-sb-db-server/start_sb_db_server.sh
diff --git a/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2 b/kolla/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2
index 2527fa0e6..2527fa0e6 100644
--- a/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2
+++ b/kolla/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2
diff --git a/docker/ovsdpdk/ovsdpdk-db/extend_start.sh b/kolla/docker/ovsdpdk/ovsdpdk-db/extend_start.sh
index 3883b50ed..3883b50ed 100644
--- a/docker/ovsdpdk/ovsdpdk-db/extend_start.sh
+++ b/kolla/docker/ovsdpdk/ovsdpdk-db/extend_start.sh
diff --git a/docker/ovsdpdk/ovsdpdk-db/start_ovsdb_server.sh b/kolla/docker/ovsdpdk/ovsdpdk-db/start_ovsdb_server.sh
index 5c92fba78..5c92fba78 100755
--- a/docker/ovsdpdk/ovsdpdk-db/start_ovsdb_server.sh
+++ b/kolla/docker/ovsdpdk/ovsdpdk-db/start_ovsdb_server.sh
diff --git a/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2 b/kolla/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2
index 059efd46b..059efd46b 100644
--- a/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2
+++ b/kolla/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2
diff --git a/docker/ovsdpdk/ovsdpdk-vswitchd/extend_start.sh b/kolla/docker/ovsdpdk/ovsdpdk-vswitchd/extend_start.sh
index cf9d733e8..cf9d733e8 100644
--- a/docker/ovsdpdk/ovsdpdk-vswitchd/extend_start.sh
+++ b/kolla/docker/ovsdpdk/ovsdpdk-vswitchd/extend_start.sh
diff --git a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 b/kolla/docker/ovsdpdk/ovsdpdk/Dockerfile.j2
index eab4f5474..eab4f5474 100644
--- a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2
+++ b/kolla/docker/ovsdpdk/ovsdpdk/Dockerfile.j2
diff --git a/docker/ovsdpdk/ovsdpdk/extend_start.sh b/kolla/docker/ovsdpdk/ovsdpdk/extend_start.sh
index 60ab0c088..60ab0c088 100644
--- a/docker/ovsdpdk/ovsdpdk/extend_start.sh
+++ b/kolla/docker/ovsdpdk/ovsdpdk/extend_start.sh
diff --git a/docker/placement/placement-api/Dockerfile.j2 b/kolla/docker/placement/placement-api/Dockerfile.j2
index a13f65bdf..a13f65bdf 100644
--- a/docker/placement/placement-api/Dockerfile.j2
+++ b/kolla/docker/placement/placement-api/Dockerfile.j2
diff --git a/docker/placement/placement-api/extend_start.sh b/kolla/docker/placement/placement-api/extend_start.sh
index e468cbcaf..e468cbcaf 100644
--- a/docker/placement/placement-api/extend_start.sh
+++ b/kolla/docker/placement/placement-api/extend_start.sh
diff --git a/docker/placement/placement-base/Dockerfile.j2 b/kolla/docker/placement/placement-base/Dockerfile.j2
index 6454da748..6454da748 100644
--- a/docker/placement/placement-base/Dockerfile.j2
+++ b/kolla/docker/placement/placement-base/Dockerfile.j2
diff --git a/docker/placement/placement-base/extend_start.sh b/kolla/docker/placement/placement-base/extend_start.sh
index 900ea8447..900ea8447 100644
--- a/docker/placement/placement-base/extend_start.sh
+++ b/kolla/docker/placement/placement-base/extend_start.sh
diff --git a/docker/prometheus/prometheus-alertmanager/Dockerfile.j2 b/kolla/docker/prometheus/prometheus-alertmanager/Dockerfile.j2
index 8f2df0492..8f2df0492 100644
--- a/docker/prometheus/prometheus-alertmanager/Dockerfile.j2
+++ b/kolla/docker/prometheus/prometheus-alertmanager/Dockerfile.j2
diff --git a/docker/prometheus/prometheus-base/Dockerfile.j2 b/kolla/docker/prometheus/prometheus-base/Dockerfile.j2
index 123bd4ba3..123bd4ba3 100644
--- a/docker/prometheus/prometheus-base/Dockerfile.j2
+++ b/kolla/docker/prometheus/prometheus-base/Dockerfile.j2
diff --git a/docker/prometheus/prometheus-base/extend_start.sh b/kolla/docker/prometheus/prometheus-base/extend_start.sh
index 8613330c6..8613330c6 100644
--- a/docker/prometheus/prometheus-base/extend_start.sh
+++ b/kolla/docker/prometheus/prometheus-base/extend_start.sh
diff --git a/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 b/kolla/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2
index 95018facf..95018facf 100644
--- a/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2
+++ b/kolla/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2
diff --git a/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 b/kolla/docker/prometheus/prometheus-cadvisor/Dockerfile.j2
index 884f4acd2..884f4acd2 100644
--- a/docker/prometheus/prometheus-cadvisor/Dockerfile.j2
+++ b/kolla/docker/prometheus/prometheus-cadvisor/Dockerfile.j2
diff --git a/docker/prometheus/prometheus-elasticsearch-exporter/Dockerfile.j2 b/kolla/docker/prometheus/prometheus-elasticsearch-exporter/Dockerfile.j2
index 63d09409c..63d09409c 100644
--- a/docker/prometheus/prometheus-elasticsearch-exporter/Dockerfile.j2
+++ b/kolla/docker/prometheus/prometheus-elasticsearch-exporter/Dockerfile.j2
diff --git a/docker/prometheus/prometheus-libvirt-exporter/Dockerfile.j2 b/kolla/docker/prometheus/prometheus-libvirt-exporter/Dockerfile.j2
index c32b2f8c7..c32b2f8c7 100644
--- a/docker/prometheus/prometheus-libvirt-exporter/Dockerfile.j2
+++ b/kolla/docker/prometheus/prometheus-libvirt-exporter/Dockerfile.j2
diff --git a/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 b/kolla/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2
index cb50c2095..cb50c2095 100644
--- a/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2
+++ b/kolla/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2
diff --git a/docker/prometheus/prometheus-mtail/Dockerfile.j2 b/kolla/docker/prometheus/prometheus-mtail/Dockerfile.j2
index a562bfd71..a562bfd71 100644
--- a/docker/prometheus/prometheus-mtail/Dockerfile.j2
+++ b/kolla/docker/prometheus/prometheus-mtail/Dockerfile.j2
diff --git a/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 b/kolla/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2
index f8d2abaa6..f8d2abaa6 100644
--- a/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2
+++ b/kolla/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2
diff --git a/docker/prometheus/prometheus-node-exporter/Dockerfile.j2 b/kolla/docker/prometheus/prometheus-node-exporter/Dockerfile.j2
index 3250d3d7a..3250d3d7a 100644
--- a/docker/prometheus/prometheus-node-exporter/Dockerfile.j2
+++ b/kolla/docker/prometheus/prometheus-node-exporter/Dockerfile.j2
diff --git a/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 b/kolla/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2
index 437f3a6cd..437f3a6cd 100644
--- a/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2
+++ b/kolla/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2
diff --git a/docker/prometheus/prometheus-openstack-network-exporter/Dockerfile.j2 b/kolla/docker/prometheus/prometheus-openstack-network-exporter/Dockerfile.j2
index 3d4d9197b..3d4d9197b 100644
--- a/docker/prometheus/prometheus-openstack-network-exporter/Dockerfile.j2
+++ b/kolla/docker/prometheus/prometheus-openstack-network-exporter/Dockerfile.j2
diff --git a/docker/prometheus/prometheus-server/Dockerfile.j2 b/kolla/docker/prometheus/prometheus-server/Dockerfile.j2
index a3b227d7e..a3b227d7e 100644
--- a/docker/prometheus/prometheus-server/Dockerfile.j2
+++ b/kolla/docker/prometheus/prometheus-server/Dockerfile.j2
diff --git a/docker/prometheus/prometheus-valkey-exporter/Dockerfile.j2 b/kolla/docker/prometheus/prometheus-valkey-exporter/Dockerfile.j2
index c6cf79ac3..c6cf79ac3 100644
--- a/docker/prometheus/prometheus-valkey-exporter/Dockerfile.j2
+++ b/kolla/docker/prometheus/prometheus-valkey-exporter/Dockerfile.j2
diff --git a/docker/proxysql/Dockerfile.j2 b/kolla/docker/proxysql/Dockerfile.j2
index a76dbcda8..a76dbcda8 100644
--- a/docker/proxysql/Dockerfile.j2
+++ b/kolla/docker/proxysql/Dockerfile.j2
diff --git a/docker/proxysql/kolla_extend_start b/kolla/docker/proxysql/kolla_extend_start
index 229e8ada2..229e8ada2 100644
--- a/docker/proxysql/kolla_extend_start
+++ b/kolla/docker/proxysql/kolla_extend_start
diff --git a/docker/proxysql/kolla_proxysql_config_sync b/kolla/docker/proxysql/kolla_proxysql_config_sync
index 094642c8a..094642c8a 100644
--- a/docker/proxysql/kolla_proxysql_config_sync
+++ b/kolla/docker/proxysql/kolla_proxysql_config_sync
diff --git a/docker/rabbitmq/Dockerfile.j2 b/kolla/docker/rabbitmq/Dockerfile.j2
index a167356a7..a167356a7 100644
--- a/docker/rabbitmq/Dockerfile.j2
+++ b/kolla/docker/rabbitmq/Dockerfile.j2
diff --git a/docker/rabbitmq/apt_preferences_rabbitmq.debian b/kolla/docker/rabbitmq/apt_preferences_rabbitmq.debian
index cc6404b3e..cc6404b3e 100644
--- a/docker/rabbitmq/apt_preferences_rabbitmq.debian
+++ b/kolla/docker/rabbitmq/apt_preferences_rabbitmq.debian
diff --git a/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu b/kolla/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu
index cc6404b3e..cc6404b3e 100644
--- a/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu
+++ b/kolla/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu
diff --git a/docker/rabbitmq/extend_start.sh b/kolla/docker/rabbitmq/extend_start.sh
index ef28d2b5f..ef28d2b5f 100644
--- a/docker/rabbitmq/extend_start.sh
+++ b/kolla/docker/rabbitmq/extend_start.sh
diff --git a/docker/rabbitmq/healthcheck_rabbitmq b/kolla/docker/rabbitmq/healthcheck_rabbitmq
index 277ab098c..277ab098c 100644
--- a/docker/rabbitmq/healthcheck_rabbitmq
+++ b/kolla/docker/rabbitmq/healthcheck_rabbitmq
diff --git a/docker/skyline/skyline-apiserver/Dockerfile.j2 b/kolla/docker/skyline/skyline-apiserver/Dockerfile.j2
index 85b40d51c..85b40d51c 100644
--- a/docker/skyline/skyline-apiserver/Dockerfile.j2
+++ b/kolla/docker/skyline/skyline-apiserver/Dockerfile.j2
diff --git a/docker/skyline/skyline-apiserver/extend_start.sh b/kolla/docker/skyline/skyline-apiserver/extend_start.sh
index e1802937b..e1802937b 100644
--- a/docker/skyline/skyline-apiserver/extend_start.sh
+++ b/kolla/docker/skyline/skyline-apiserver/extend_start.sh
diff --git a/docker/skyline/skyline-base/Dockerfile.j2 b/kolla/docker/skyline/skyline-base/Dockerfile.j2
index 815fa504f..815fa504f 100644
--- a/docker/skyline/skyline-base/Dockerfile.j2
+++ b/kolla/docker/skyline/skyline-base/Dockerfile.j2
diff --git a/docker/skyline/skyline-base/extend_start.sh b/kolla/docker/skyline/skyline-base/extend_start.sh
index 34362ad04..34362ad04 100644
--- a/docker/skyline/skyline-base/extend_start.sh
+++ b/kolla/docker/skyline/skyline-base/extend_start.sh
diff --git a/docker/skyline/skyline-console/Dockerfile.j2 b/kolla/docker/skyline/skyline-console/Dockerfile.j2
index ba62f5041..ba62f5041 100644
--- a/docker/skyline/skyline-console/Dockerfile.j2
+++ b/kolla/docker/skyline/skyline-console/Dockerfile.j2
diff --git a/docker/tacker/tacker-base/Dockerfile.j2 b/kolla/docker/tacker/tacker-base/Dockerfile.j2
index c24c8d87c..c24c8d87c 100644
--- a/docker/tacker/tacker-base/Dockerfile.j2
+++ b/kolla/docker/tacker/tacker-base/Dockerfile.j2
diff --git a/docker/tacker/tacker-base/extend_start.sh b/kolla/docker/tacker/tacker-base/extend_start.sh
index a3b7db8d3..a3b7db8d3 100644
--- a/docker/tacker/tacker-base/extend_start.sh
+++ b/kolla/docker/tacker/tacker-base/extend_start.sh
diff --git a/docker/tacker/tacker-conductor/Dockerfile.j2 b/kolla/docker/tacker/tacker-conductor/Dockerfile.j2
index 676c90106..676c90106 100644
--- a/docker/tacker/tacker-conductor/Dockerfile.j2
+++ b/kolla/docker/tacker/tacker-conductor/Dockerfile.j2
diff --git a/docker/tacker/tacker-server/Dockerfile.j2 b/kolla/docker/tacker/tacker-server/Dockerfile.j2
index 659b70bea..659b70bea 100644
--- a/docker/tacker/tacker-server/Dockerfile.j2
+++ b/kolla/docker/tacker/tacker-server/Dockerfile.j2
diff --git a/docker/tacker/tacker-server/extend_start.sh b/kolla/docker/tacker/tacker-server/extend_start.sh
index 311d21f71..311d21f71 100644
--- a/docker/tacker/tacker-server/extend_start.sh
+++ b/kolla/docker/tacker/tacker-server/extend_start.sh
diff --git a/docker/tgtd/Dockerfile.j2 b/kolla/docker/tgtd/Dockerfile.j2
index b8cbbaaf5..b8cbbaaf5 100644
--- a/docker/tgtd/Dockerfile.j2
+++ b/kolla/docker/tgtd/Dockerfile.j2
diff --git a/docker/trove/trove-api/Dockerfile.j2 b/kolla/docker/trove/trove-api/Dockerfile.j2
index 8d2885b86..8d2885b86 100644
--- a/docker/trove/trove-api/Dockerfile.j2
+++ b/kolla/docker/trove/trove-api/Dockerfile.j2
diff --git a/docker/trove/trove-api/extend_start.sh b/kolla/docker/trove/trove-api/extend_start.sh
index 76839e2d4..76839e2d4 100644
--- a/docker/trove/trove-api/extend_start.sh
+++ b/kolla/docker/trove/trove-api/extend_start.sh
diff --git a/docker/trove/trove-base/Dockerfile.j2 b/kolla/docker/trove/trove-base/Dockerfile.j2
index a675b2b72..a675b2b72 100644
--- a/docker/trove/trove-base/Dockerfile.j2
+++ b/kolla/docker/trove/trove-base/Dockerfile.j2
diff --git a/docker/trove/trove-base/extend_start.sh b/kolla/docker/trove/trove-base/extend_start.sh
index 581a83d7b..581a83d7b 100644
--- a/docker/trove/trove-base/extend_start.sh
+++ b/kolla/docker/trove/trove-base/extend_start.sh
diff --git a/docker/trove/trove-conductor/Dockerfile.j2 b/kolla/docker/trove/trove-conductor/Dockerfile.j2
index 4a038c7f9..4a038c7f9 100644
--- a/docker/trove/trove-conductor/Dockerfile.j2
+++ b/kolla/docker/trove/trove-conductor/Dockerfile.j2
diff --git a/docker/trove/trove-guestagent/Dockerfile.j2 b/kolla/docker/trove/trove-guestagent/Dockerfile.j2
index 178260cae..178260cae 100644
--- a/docker/trove/trove-guestagent/Dockerfile.j2
+++ b/kolla/docker/trove/trove-guestagent/Dockerfile.j2
diff --git a/docker/trove/trove-taskmanager/Dockerfile.j2 b/kolla/docker/trove/trove-taskmanager/Dockerfile.j2
index cef0a0ce9..cef0a0ce9 100644
--- a/docker/trove/trove-taskmanager/Dockerfile.j2
+++ b/kolla/docker/trove/trove-taskmanager/Dockerfile.j2
diff --git a/docker/valkey/valkey-base/Dockerfile.j2 b/kolla/docker/valkey/valkey-base/Dockerfile.j2
index bc17c0cbb..bc17c0cbb 100644
--- a/docker/valkey/valkey-base/Dockerfile.j2
+++ b/kolla/docker/valkey/valkey-base/Dockerfile.j2
diff --git a/docker/valkey/valkey-base/extend_start.sh b/kolla/docker/valkey/valkey-base/extend_start.sh
index 3a3a321d4..3a3a321d4 100644
--- a/docker/valkey/valkey-base/extend_start.sh
+++ b/kolla/docker/valkey/valkey-base/extend_start.sh
diff --git a/docker/valkey/valkey-sentinel/Dockerfile.j2 b/kolla/docker/valkey/valkey-sentinel/Dockerfile.j2
index 94828a38f..94828a38f 100644
--- a/docker/valkey/valkey-sentinel/Dockerfile.j2
+++ b/kolla/docker/valkey/valkey-sentinel/Dockerfile.j2
diff --git a/docker/valkey/valkey-sentinel/extend_start.sh b/kolla/docker/valkey/valkey-sentinel/extend_start.sh
index e6af42ef6..e6af42ef6 100644
--- a/docker/valkey/valkey-sentinel/extend_start.sh
+++ b/kolla/docker/valkey/valkey-sentinel/extend_start.sh
diff --git a/docker/valkey/valkey-server/Dockerfile.j2 b/kolla/docker/valkey/valkey-server/Dockerfile.j2
index be157d89e..be157d89e 100644
--- a/docker/valkey/valkey-server/Dockerfile.j2
+++ b/kolla/docker/valkey/valkey-server/Dockerfile.j2
diff --git a/docker/watcher/watcher-api/Dockerfile.j2 b/kolla/docker/watcher/watcher-api/Dockerfile.j2
index f31b53ecf..f31b53ecf 100644
--- a/docker/watcher/watcher-api/Dockerfile.j2
+++ b/kolla/docker/watcher/watcher-api/Dockerfile.j2
diff --git a/docker/watcher/watcher-api/extend_start.sh b/kolla/docker/watcher/watcher-api/extend_start.sh
index 629ea6355..629ea6355 100644
--- a/docker/watcher/watcher-api/extend_start.sh
+++ b/kolla/docker/watcher/watcher-api/extend_start.sh
diff --git a/docker/watcher/watcher-applier/Dockerfile.j2 b/kolla/docker/watcher/watcher-applier/Dockerfile.j2
index db28d81d9..db28d81d9 100644
--- a/docker/watcher/watcher-applier/Dockerfile.j2
+++ b/kolla/docker/watcher/watcher-applier/Dockerfile.j2
diff --git a/docker/watcher/watcher-base/Dockerfile.j2 b/kolla/docker/watcher/watcher-base/Dockerfile.j2
index 8de6ceb9d..8de6ceb9d 100644
--- a/docker/watcher/watcher-base/Dockerfile.j2
+++ b/kolla/docker/watcher/watcher-base/Dockerfile.j2
diff --git a/docker/watcher/watcher-base/extend_start.sh b/kolla/docker/watcher/watcher-base/extend_start.sh
index 9e27a9cf0..9e27a9cf0 100644
--- a/docker/watcher/watcher-base/extend_start.sh
+++ b/kolla/docker/watcher/watcher-base/extend_start.sh
diff --git a/docker/watcher/watcher-engine/Dockerfile.j2 b/kolla/docker/watcher/watcher-engine/Dockerfile.j2
index 2518a92b6..2518a92b6 100644
--- a/docker/watcher/watcher-engine/Dockerfile.j2
+++ b/kolla/docker/watcher/watcher-engine/Dockerfile.j2
diff --git a/kolla/image/kolla_worker.py b/kolla/image/kolla_worker.py
index 1c704d1cf..1dc37e2a6 100644
--- a/kolla/image/kolla_worker.py
+++ b/kolla/image/kolla_worker.py
@@ -40,6 +40,8 @@ from oslo_config import cfg
 
 PROJECT_ROOT = os.path.abspath(os.path.join(
     os.path.dirname(os.path.realpath(__file__)), '../..'))
+KOLLA_PACKAGE_DIR = os.path.abspath(os.path.join(
+    os.path.dirname(os.path.realpath(__file__)), '..'))
 
 
 class Image(object):
@@ -213,6 +215,7 @@ class KollaWorker(object):
 
     def _get_images_dir(self):
         possible_paths = (
+            KOLLA_PACKAGE_DIR,
             PROJECT_ROOT,
             os.path.join(sys.prefix, 'share/kolla'),
             os.path.join(sys.prefix, 'local/share/kolla'),
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 000000000..25628706c
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,43 @@
+[build-system]
+requires = ["pbr>=6.1.1"]
+build-backend = "pbr.build"
+
+[project]
+name = "kolla"
+description = "Tool for building production-ready OpenStack and infrastructure containers"
+authors = [
+    {name = "OpenStack", email = "openstack-discuss@lists.openstack.org"},
+]
+readme = {file = "README.rst", content-type = "text/x-rst"}
+license = "Apache-2.0"
+dynamic = ["version", "dependencies"]
+requires-python = ">=3.10"
+classifiers = [
+    "Environment :: OpenStack",
+    "Intended Audience :: Information Technology",
+    "Intended Audience :: System Administrators",
+    "Operating System :: POSIX :: Linux",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+]
+
+[project.urls]
+Homepage = "https://docs.openstack.org/kolla/latest/"
+
+[project.scripts]
+kolla-build = "kolla.cmd.build:main"
+
+[project.entry-points."oslo.config.opts"]
+kolla = "kolla.opts:list_opts"
+
+[tool.setuptools.packages.find]
+include = ["kolla*"]
+
+[tool.setuptools.package-data]
+kolla = ["docker/**"]
diff --git a/setup.cfg b/setup.cfg
index 2634ee512..f75aa848d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,43 +1,2 @@
 [metadata]
 name = kolla
-summary = Kolla OpenStack Deployment
-description_file =
-    README.rst
-author = OpenStack
-author_email = openstack-discuss@lists.openstack.org
-home_page = https://docs.openstack.org/kolla/latest/
-python_requires = >=3.10
-license = Apache License, Version 2.0
-classifier =
-    Environment :: OpenStack
-    Intended Audience :: Information Technology
-    Intended Audience :: System Administrators
-    License :: OSI Approved :: Apache Software License
-    Operating System :: POSIX :: Linux
-    Programming Language :: Python
-    Programming Language :: Python :: Implementation :: CPython
-    Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.10
-    Programming Language :: Python :: 3.11
-    Programming Language :: Python :: 3.12
-    Programming Language :: Python :: 3.13
-
-[files]
-packages =
-    kolla
-data_files =
-    share/kolla/docker = docker/*
-    share/kolla/tools = tools/validate-docker-execute.sh
-    share/kolla/tools = tools/cleanup-images
-    share/kolla/tools = tools/start-registry
-    share/kolla/doc = doc/*
-    share/kolla/etc_examples = etc/*
-    share/kolla/contrib = contrib/*
-    share/kolla = setup.cfg
-
-[entry_points]
-console_scripts =
-    kolla-build = kolla.cmd.build:main
-oslo.config.opts =
-    kolla = kolla.opts:list_opts
diff --git a/tests/test_set_config.py b/tests/test_set_config.py
index bf78ed4aa..831850b0a 100644
--- a/tests/test_set_config.py
+++ b/tests/test_set_config.py
@@ -32,7 +32,7 @@ def load_module(name, path):
 # nasty: to import set_config (not a part of the kolla package)
 this_dir = os.path.dirname(sys.modules[__name__].__file__)
 set_configs_file = os.path.abspath(
-    os.path.join(this_dir, '..',
+    os.path.join(this_dir, '..', 'kolla',
                  'docker', 'base', 'set_configs.py'))
 
 set_configs = load_module('set_configs', set_configs_file)