From a8416f968e56b0e038fd45bd0d8819e4940516dd Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Mon, 9 Dec 2024 12:05:45 -0600
Subject: [PATCH] Move values overrides to a separate directory

This is the action item to implement the spec:
doc/source/specs/2025.1/chart_versioning.rst

Depends-On: I327103c18fc0e10e989a17f69b3bff9995c45eb4
Depends-On: I7bfdef3ea2128bbb4e26e3a00161fe30ce29b8e7
Change-Id: I4974785c904cf7c8730279854e3ad9b6b7c35498
---
 doc/source/install/openstack.rst              |  4 +-
 doc/source/specs/2025.1/chart_versioning.rst  |  2 +-
 tools/deployment/common/lockdown-netpol.sh    |  4 +-
 tools/deployment/common/openstack-exporter.sh |  4 +-
 tools/deployment/common/push-images.sh        | 18 ++++++
 tools/deployment/component/aodh/aodh.sh       |  4 +-
 .../deployment/component/barbican/barbican.sh |  4 +-
 .../component/ceilometer/ceilometer.sh        |  4 +-
 .../component/ceph/ceph-ns-activate.sh        |  4 +-
 tools/deployment/component/ceph/ceph.sh       |  4 +-
 tools/deployment/component/cinder/cinder.sh   |  4 +-
 tools/deployment/component/common/ldap.sh     |  4 +-
 tools/deployment/component/common/mariadb.sh  |  4 +-
 .../deployment/component/common/memcached.sh  |  4 +-
 .../deployment/component/common/openstack.sh  | 26 ++++-----
 tools/deployment/component/common/rabbitmq.sh |  4 +-
 .../component/compute-kit/compute-kit.sh      |  8 +--
 .../component/compute-kit/libvirt.sh          |  4 +-
 .../component/compute-kit/openvswitch.sh      |  4 +-
 tools/deployment/component/glance/glance.sh   |  4 +-
 tools/deployment/component/heat/heat.sh       |  4 +-
 tools/deployment/component/horizon/horizon.sh |  4 +-
 .../deployment/component/keystone/keystone.sh |  4 +-
 tools/deployment/component/magnum/magnum.sh   |  8 ++-
 tools/deployment/component/manila/manila.sh   |  8 ++-
 tools/deployment/component/mistral/mistral.sh |  6 +-
 .../nfs-provisioner/nfs-provisioner.sh        |  8 ++-
 .../component/ovn/120-openvswitch.sh          | 30 ----------
 .../component/ovn/140-compute-kit.sh          | 56 -------------------
 tools/deployment/component/ovn/ovn.sh         | 11 ++--
 tools/deployment/component/senlin/senlin.sh   |  8 ++-
 tools/deployment/component/tacker/tacker.sh   |  4 +-
 .../aodh}/annotations.yaml                    |  0
 .../barbican}/2023.1-ubuntu_focal.yaml        |  0
 .../barbican}/2023.1-ubuntu_jammy.yaml        |  0
 .../barbican}/2023.2-ubuntu_jammy.yaml        |  0
 .../barbican}/2024.1-ubuntu_jammy.yaml        |  0
 .../barbican}/2024.2-ubuntu_jammy.yaml        |  0
 .../barbican}/annotations.yaml                |  0
 .../barbican}/apparmor.yaml                   |  0
 .../barbican}/netpol.yaml                     |  0
 .../barbican}/tls-offloading.yaml             |  0
 .../barbican}/tls.yaml                        |  0
 .../barbican}/victoria-ubuntu_focal.yaml      |  0
 .../barbican}/wallaby-ubuntu_focal.yaml       |  0
 .../barbican}/xena-ubuntu_focal.yaml          |  0
 .../barbican}/yoga-ubuntu_focal.yaml          |  0
 .../barbican}/zed-ubuntu_focal.yaml           |  0
 .../barbican}/zed-ubuntu_jammy.yaml           |  0
 .../ceilometer}/annotations.yaml              |  0
 .../cinder}/2023.1-ubuntu_focal.yaml          |  0
 .../cinder}/2023.1-ubuntu_jammy.yaml          |  0
 .../cinder}/2023.2-ubuntu_jammy.yaml          |  0
 .../cinder}/2024.1-ubuntu_jammy.yaml          |  0
 .../cinder}/2024.2-ubuntu_jammy.yaml          |  0
 .../cinder}/annotations.yaml                  |  0
 .../cinder}/apparmor.yaml                     |  0
 .../cinder}/backend_pure.yaml                 |  0
 .../cinder}/external-ceph-backend.yaml        |  0
 .../cinder}/external-ceph-configmap.yaml      |  0
 .../cinder}/netpol.yaml                       |  0
 .../cinder}/nfs-cinder-backup.yaml            |  0
 .../cinder}/qos.yaml                          |  0
 .../cinder}/tls-offloading.yaml               |  0
 .../cinder}/tls.yaml                          |  0
 .../cinder}/victoria-ubuntu_focal.yaml        |  0
 .../cinder}/wallaby-ubuntu_focal.yaml         |  0
 .../cinder}/xena-ubuntu_focal.yaml            |  0
 .../cinder}/yoga-ubuntu_focal.yaml            |  0
 .../cinder}/zed-ubuntu_focal.yaml             |  0
 .../cinder}/zed-ubuntu_jammy.yaml             |  0
 .../cyborg}/annotations.yaml                  |  0
 .../designate}/annotations.yaml               |  0
 .../glance}/2023.1-ubuntu_focal.yaml          |  0
 .../glance}/2023.1-ubuntu_jammy.yaml          |  0
 .../glance}/2023.2-ubuntu_jammy.yaml          |  0
 .../glance}/2024.1-ubuntu_jammy.yaml          |  0
 .../glance}/2024.2-ubuntu_jammy.yaml          |  0
 .../glance}/annotations.yaml                  |  0
 .../glance}/apparmor.yaml                     |  0
 .../glance}/bootstrap-ubuntu-image.yaml       |  0
 .../glance}/netpol.yaml                       |  0
 .../glance}/tls-offloading.yaml               |  0
 .../glance}/tls.yaml                          |  0
 .../glance}/victoria-ubuntu_focal.yaml        |  0
 .../glance}/wallaby-ubuntu_focal.yaml         |  0
 .../glance}/xena-ubuntu_focal.yaml            |  0
 .../glance}/yoga-ubuntu_focal.yaml            |  0
 .../glance}/zed-ubuntu_focal.yaml             |  0
 .../glance}/zed-ubuntu_jammy.yaml             |  0
 .../heat}/2023.1-ubuntu_focal.yaml            |  0
 .../heat}/2023.1-ubuntu_jammy.yaml            |  0
 .../heat}/2023.2-ubuntu_jammy.yaml            |  0
 .../heat}/2024.1-ubuntu_jammy.yaml            |  0
 .../heat}/2024.2-ubuntu_jammy.yaml            |  0
 .../heat}/annotations.yaml                    |  0
 .../heat}/apparmor.yaml                       |  0
 .../heat}/netpol.yaml                         |  0
 .../heat}/tls-offloading.yaml                 |  0
 .../heat}/tls.yaml                            |  0
 .../heat}/victoria-ubuntu_focal.yaml          |  0
 .../heat}/wallaby-ubuntu_focal.yaml           |  0
 .../heat}/xena-ubuntu_focal.yaml              |  0
 .../heat}/yoga-ubuntu_focal.yaml              |  0
 .../heat}/zed-ubuntu_focal.yaml               |  0
 .../heat}/zed-ubuntu_jammy.yaml               |  0
 .../horizon}/2023.1-ubuntu_focal.yaml         |  0
 .../horizon}/2023.1-ubuntu_jammy.yaml         |  0
 .../horizon}/2023.2-ubuntu_jammy.yaml         |  0
 .../horizon}/2024.1-ubuntu_jammy.yaml         |  0
 .../horizon}/2024.2-ubuntu_jammy.yaml         |  0
 .../horizon}/annotations.yaml                 |  0
 .../horizon}/apparmor.yaml                    |  0
 .../horizon}/logo.yaml                        |  0
 .../horizon}/netpol.yaml                      |  0
 .../horizon}/tls.yaml                         |  0
 .../horizon}/victoria-ubuntu_focal.yaml       |  0
 .../horizon}/wallaby-ubuntu_focal.yaml        |  0
 .../horizon}/xena-ubuntu_focal.yaml           |  0
 .../horizon}/yoga-ubuntu_focal.yaml           |  0
 .../horizon}/zed-ubuntu_focal.yaml            |  0
 .../horizon}/zed-ubuntu_jammy.yaml            |  0
 .../ironic}/annotations.yaml                  |  0
 .../ironic}/standalone.yaml                   |  0
 .../keystone}/2023.1-ubuntu_focal.yaml        |  0
 .../keystone}/2023.1-ubuntu_jammy.yaml        |  0
 .../keystone}/2023.2-ubuntu_jammy.yaml        |  0
 .../keystone}/2024.1-ubuntu_jammy.yaml        |  0
 .../keystone}/2024.2-ubuntu_jammy.yaml        |  0
 .../keystone}/annotations.yaml                |  0
 .../keystone}/apparmor.yaml                   |  0
 .../keystone}/internal-reverse-proxy.yaml     |  0
 .../keystone}/ldap.yaml                       |  0
 .../keystone}/netpol.yaml                     |  0
 .../keystone}/tls-custom.yaml                 |  0
 .../keystone}/tls.yaml                        |  0
 .../keystone}/victoria-ubuntu_focal.yaml      |  0
 .../keystone}/wallaby-ubuntu_focal.yaml       |  0
 .../keystone}/xena-ubuntu_focal.yaml          |  0
 .../keystone}/yoga-ubuntu_focal.yaml          |  0
 .../keystone}/zed-ubuntu_focal.yaml           |  0
 .../keystone}/zed-ubuntu_jammy.yaml           |  0
 .../magnum}/annotations.yaml                  |  0
 .../manila}/2023.1-ubuntu_focal.yaml          |  0
 .../manila}/2023.1-ubuntu_jammy.yaml          |  0
 .../manila}/2023.2-ubuntu_jammy.yaml          |  0
 .../manila}/2024.1-ubuntu_jammy.yaml          |  0
 .../manila}/2024.2-ubuntu_jammy.yaml          |  0
 .../manila}/annotations.yaml                  |  0
 .../manila}/apparmor.yaml                     |  0
 .../manila}/tls-offloading.yaml               |  0
 .../manila}/tls.yaml                          |  0
 .../manila}/xena-ubuntu_focal.yaml            |  0
 .../manila}/yoga-ubuntu_focal.yaml            |  0
 .../manila}/zed-ubuntu_focal.yaml             |  0
 .../manila}/zed-ubuntu_jammy.yaml             |  0
 .../masakari}/annotations.yaml                |  0
 .../mistral}/annotations.yaml                 |  0
 .../monasca}/annotations.yaml                 |  0
 .../monasca}/libvirt.yaml                     |  0
 .../monasca}/nvidia.yaml                      |  0
 .../neutron}/2023.1-ubuntu_focal.yaml         |  0
 .../neutron}/2023.1-ubuntu_jammy.yaml         |  0
 .../neutron}/2023.2-ubuntu_jammy.yaml         |  0
 .../neutron}/2024.1-ubuntu_jammy.yaml         |  0
 .../neutron}/2024.2-ubuntu_jammy.yaml         |  0
 .../neutron}/annotations.yaml                 |  0
 .../neutron}/apparmor.yaml                    |  0
 .../neutron}/bagpipe_bgp.yaml                 |  0
 .../neutron}/dpdk-bond.yaml                   |  0
 .../neutron}/dpdk.yaml                        |  0
 .../neutron}/gate.yaml                        |  0
 .../neutron}/l2gateway.yaml                   |  0
 .../neutron}/netpol.yaml                      |  0
 .../neutron}/ovn.yaml                         |  0
 .../neutron}/ovn_vpn.yaml                     |  0
 .../neutron}/shared-sriov-ovs-dpdk-bond.yaml  |  0
 .../neutron}/tf.yaml                          |  0
 .../neutron}/tls-offloading.yaml              |  0
 .../neutron}/tls.yaml                         |  0
 .../neutron}/victoria-ubuntu_focal.yaml       |  0
 .../neutron}/wallaby-ubuntu_focal.yaml        |  0
 .../neutron}/xena-ubuntu_focal.yaml           |  0
 .../neutron}/yoga-ubuntu_focal.yaml           |  0
 .../neutron}/zed-ubuntu_focal.yaml            |  0
 .../neutron}/zed-ubuntu_jammy.yaml            |  0
 .../nova}/2023.1-ubuntu_focal.yaml            |  0
 .../nova}/2023.1-ubuntu_jammy.yaml            |  0
 .../nova}/2023.2-ubuntu_jammy.yaml            |  0
 .../nova}/2024.1-ubuntu_jammy.yaml            |  0
 .../nova}/2024.2-ubuntu_jammy.yaml            |  0
 .../nova}/annotations.yaml                    |  0
 .../nova}/apparmor.yaml                       |  0
 .../nova}/cntt.yaml                           |  0
 .../nova}/dpdk.yaml                           |  0
 .../nova}/netpol.yaml                         |  0
 .../nova}/opensuse_15.yaml                    |  0
 .../nova}/ovn.yaml                            |  0
 .../nova}/ssh.yaml                            |  0
 .../nova}/tf.yaml                             |  0
 .../nova}/tls-offloading.yaml                 |  0
 .../nova}/tls.yaml                            |  0
 .../nova}/victoria-ubuntu_focal.yaml          |  0
 .../nova}/wallaby-ubuntu_focal.yaml           |  0
 .../nova}/xena-ubuntu_focal.yaml              |  0
 .../nova}/yoga-ubuntu_focal.yaml              |  0
 .../nova}/zed-ubuntu_focal.yaml               |  0
 .../nova}/zed-ubuntu_jammy.yaml               |  0
 .../octavia}/annotations.yaml                 |  0
 .../glance/2023.1-ubuntu_focal.yaml           |  0
 .../glance/2023.1-ubuntu_jammy.yaml           |  0
 .../glance/2023.2-ubuntu_jammy.yaml           |  0
 .../glance/2024.1-ubuntu_jammy.yaml           |  0
 .../glance/2024.2-ubuntu_jammy.yaml           |  0
 .../openstack}/glance/apparmor.yaml           |  0
 .../openstack}/glance/netpol.yaml             |  0
 .../openstack}/glance/tls.yaml                |  0
 .../glance/victoria-ubuntu_focal.yaml         |  0
 .../glance/wallaby-ubuntu_focal.yaml          |  0
 .../openstack}/glance/zed-ubuntu_focal.yaml   |  0
 .../openstack}/glance/zed-ubuntu_jammy.yaml   |  0
 .../openstack}/heat/2023.1-ubuntu_focal.yaml  |  0
 .../openstack}/heat/2023.1-ubuntu_jammy.yaml  |  0
 .../openstack}/heat/2023.2-ubuntu_jammy.yaml  |  0
 .../openstack}/heat/2024.1-ubuntu_jammy.yaml  |  0
 .../openstack}/heat/2024.2-ubuntu_jammy.yaml  |  0
 .../openstack}/heat/apparmor.yaml             |  0
 .../openstack}/heat/netpol.yaml               |  0
 .../openstack}/heat/tls.yaml                  |  0
 .../heat/victoria-ubuntu_focal.yaml           |  0
 .../openstack}/heat/wallaby-ubuntu_focal.yaml |  0
 .../openstack}/heat/zed-ubuntu_focal.yaml     |  0
 .../openstack}/heat/zed-ubuntu_jammy.yaml     |  0
 .../horizon/2023.1-ubuntu_focal.yaml          |  0
 .../horizon/2023.1-ubuntu_jammy.yaml          |  0
 .../horizon/2023.2-ubuntu_jammy.yaml          |  0
 .../horizon/2024.1-ubuntu_jammy.yaml          |  0
 .../horizon/2024.2-ubuntu_jammy.yaml          |  0
 .../openstack}/horizon/apparmor.yaml          |  0
 .../openstack}/horizon/netpol.yaml            |  0
 .../openstack}/horizon/tls.yaml               |  0
 .../horizon/victoria-ubuntu_focal.yaml        |  0
 .../horizon/wallaby-ubuntu_focal.yaml         |  0
 .../openstack}/horizon/xena-ubuntu_focal.yaml |  0
 .../openstack}/horizon/yoga-ubuntu_focal.yaml |  0
 .../openstack}/horizon/zed-ubuntu_focal.yaml  |  0
 .../openstack}/horizon/zed-ubuntu_jammy.yaml  |  0
 .../keystone/2023.1-ubuntu_focal.yaml         |  0
 .../keystone/2023.1-ubuntu_jammy.yaml         |  0
 .../keystone/2023.2-ubuntu_jammy.yaml         |  0
 .../keystone/2024.1-ubuntu_jammy.yaml         |  0
 .../keystone/2024.2-ubuntu_jammy.yaml         |  0
 .../openstack}/keystone/apparmor.yaml         |  0
 .../openstack}/keystone/ldap.yaml             |  0
 .../openstack}/keystone/netpol.yaml           |  0
 .../openstack}/keystone/tls.yaml              |  0
 .../keystone/victoria-ubuntu_focal.yaml       |  0
 .../keystone/wallaby-ubuntu_focal.yaml        |  0
 .../openstack}/keystone/zed-ubuntu_focal.yaml |  0
 .../openstack}/keystone/zed-ubuntu_jammy.yaml |  0
 .../libvirt/2023.1-ubuntu_focal.yaml          |  0
 .../libvirt/2023.1-ubuntu_jammy.yaml          |  0
 .../libvirt/2023.2-ubuntu_jammy.yaml          |  0
 .../libvirt/2024.1-ubuntu_jammy.yaml          |  0
 .../libvirt/2024.2-ubuntu_jammy.yaml          |  0
 .../openstack}/libvirt/apparmor.yaml          |  0
 .../libvirt/cinder-external-ceph-backend.yaml |  0
 .../openstack}/libvirt/netpol.yaml            |  0
 .../openstack}/libvirt/ssl.yaml               |  0
 .../libvirt/victoria-ubuntu_focal.yaml        |  0
 .../libvirt/wallaby-ubuntu_focal.yaml         |  0
 .../openstack}/libvirt/zed-ubuntu_focal.yaml  |  0
 .../openstack}/libvirt/zed-ubuntu_jammy.yaml  |  0
 .../openstack}/mariadb/apparmor.yaml          |  0
 .../openstack}/mariadb/local-storage.yaml     |  0
 .../openstack}/mariadb/netpol.yaml            |  0
 .../openstack}/mariadb/tls.yaml               |  0
 .../openstack}/memcached/apparmor.yaml        |  0
 .../openstack}/memcached/netpol.yaml          |  0
 .../neutron/2023.1-ubuntu_focal.yaml          |  0
 .../neutron/2023.1-ubuntu_jammy.yaml          |  0
 .../neutron/2023.2-ubuntu_jammy.yaml          |  0
 .../neutron/2024.1-ubuntu_jammy.yaml          |  0
 .../neutron/2024.2-ubuntu_jammy.yaml          |  0
 .../openstack}/neutron/apparmor.yaml          |  0
 .../openstack}/neutron/dpdk-bond.yaml         |  0
 .../openstack}/neutron/dpdk.yaml              |  0
 .../openstack}/neutron/gate.yaml              |  0
 .../openstack}/neutron/netpol.yaml            |  0
 .../neutron/shared-sriov-ovs-dpdk-bond.yaml   |  0
 .../openstack}/neutron/tf.yaml                |  0
 .../openstack}/neutron/tls.yaml               |  0
 .../neutron/victoria-ubuntu_focal.yaml        |  0
 .../neutron/wallaby-ubuntu_focal.yaml         |  0
 .../openstack}/neutron/zed-ubuntu_focal.yaml  |  0
 .../openstack}/neutron/zed-ubuntu_jammy.yaml  |  0
 .../openstack}/nova/2023.1-ubuntu_focal.yaml  |  0
 .../openstack}/nova/2023.1-ubuntu_jammy.yaml  |  0
 .../openstack}/nova/2023.2-ubuntu_jammy.yaml  |  0
 .../openstack}/nova/2024.1-ubuntu_jammy.yaml  |  0
 .../openstack}/nova/2024.2-ubuntu_jammy.yaml  |  0
 .../openstack}/nova/apparmor.yaml             |  0
 .../openstack}/nova/cntt.yaml                 |  0
 .../openstack}/nova/netpol.yaml               |  0
 .../openstack}/nova/opensuse_15.yaml          |  0
 .../openstack}/nova/ssh.yaml                  |  0
 .../openstack}/nova/tf.yaml                   |  0
 .../openstack}/nova/tls-offloading.yaml       |  0
 .../openstack}/nova/tls.yaml                  |  0
 .../nova/victoria-ubuntu_focal.yaml           |  0
 .../openstack}/nova/wallaby-ubuntu_focal.yaml |  0
 .../openstack}/nova/wallaby.yaml              |  0
 .../openstack}/nova/zed-ubuntu_focal.yaml     |  0
 .../openstack}/nova/zed-ubuntu_jammy.yaml     |  0
 .../openstack}/openvswitch/apparmor.yaml      |  0
 .../openvswitch/dpdk-opensuse_15.yaml         |  0
 .../openvswitch/dpdk-ubuntu_bionic.yaml       |  0
 .../openstack}/openvswitch/netpol.yaml        |  0
 .../openvswitch/vswitchd-probes.yaml          |  0
 .../placement/2023.1-ubuntu_focal.yaml        |  0
 .../placement/2023.1-ubuntu_jammy.yaml        |  0
 .../placement/2023.2-ubuntu_jammy.yaml        |  0
 .../placement/2024.1-ubuntu_jammy.yaml        |  0
 .../placement/2024.2-ubuntu_jammy.yaml        |  0
 .../openstack}/placement/apparmor.yaml        |  0
 .../openstack}/placement/netpol.yaml          |  0
 .../openstack}/placement/tls.yaml             |  0
 .../placement/train-ubuntu_bionic.yaml        |  0
 .../placement/victoria-ubuntu_focal.yaml      |  0
 .../placement/wallaby-ubuntu_focal.yaml       |  0
 .../placement/zed-ubuntu_focal.yaml           |  0
 .../placement/zed-ubuntu_jammy.yaml           |  0
 .../openstack}/rabbitmq/apparmor.yaml         |  0
 .../openstack}/rabbitmq/netpol.yaml           |  0
 .../openstack}/rabbitmq/tls.yaml              |  0
 .../placement}/2023.1-ubuntu_focal.yaml       |  0
 .../placement}/2023.1-ubuntu_jammy.yaml       |  0
 .../placement}/2023.2-ubuntu_jammy.yaml       |  0
 .../placement}/2024.1-ubuntu_jammy.yaml       |  0
 .../placement}/2024.2-ubuntu_jammy.yaml       |  0
 .../placement}/annotations.yaml               |  0
 .../placement}/apparmor.yaml                  |  0
 .../placement}/netpol.yaml                    |  0
 .../placement}/tls-offloading.yaml            |  0
 .../placement}/tls.yaml                       |  0
 .../placement}/victoria-ubuntu_focal.yaml     |  0
 .../placement}/wallaby-ubuntu_focal.yaml      |  0
 .../placement}/xena-ubuntu_focal.yaml         |  0
 .../placement}/yoga-ubuntu_focal.yaml         |  0
 .../placement}/zed-ubuntu_focal.yaml          |  0
 .../placement}/zed-ubuntu_jammy.yaml          |  0
 .../rally}/annotations.yaml                   |  0
 .../rally}/tls-offloading.yaml                |  0
 .../senlin}/annotations.yaml                  |  0
 .../tacker}/2023.1-ubuntu_focal.yaml          |  0
 .../tacker}/2023.1-ubuntu_jammy.yaml          |  0
 .../tacker}/2023.2-ubuntu_jammy.yaml          |  0
 .../tacker}/2024.1-ubuntu_jammy.yaml          |  0
 .../tacker}/2024.2-ubuntu_jammy.yaml          |  0
 .../tacker}/annotations.yaml                  |  0
 .../tacker}/zed-ubuntu_focal.yaml             |  0
 .../tacker}/zed-ubuntu_jammy.yaml             |  0
 .../tempest}/annotations.yaml                 |  0
 zuul.d/2024.1.yaml                            |  1 +
 364 files changed, 112 insertions(+), 158 deletions(-)
 create mode 100755 tools/deployment/common/push-images.sh
 delete mode 100755 tools/deployment/component/ovn/120-openvswitch.sh
 delete mode 100755 tools/deployment/component/ovn/140-compute-kit.sh
 rename {aodh/values_overrides => values_overrides/aodh}/annotations.yaml (100%)
 rename {barbican/values_overrides => values_overrides/barbican}/2023.1-ubuntu_focal.yaml (100%)
 rename {barbican/values_overrides => values_overrides/barbican}/2023.1-ubuntu_jammy.yaml (100%)
 rename {barbican/values_overrides => values_overrides/barbican}/2023.2-ubuntu_jammy.yaml (100%)
 rename {barbican/values_overrides => values_overrides/barbican}/2024.1-ubuntu_jammy.yaml (100%)
 rename {barbican/values_overrides => values_overrides/barbican}/2024.2-ubuntu_jammy.yaml (100%)
 rename {barbican/values_overrides => values_overrides/barbican}/annotations.yaml (100%)
 rename {barbican/values_overrides => values_overrides/barbican}/apparmor.yaml (100%)
 rename {barbican/values_overrides => values_overrides/barbican}/netpol.yaml (100%)
 rename {barbican/values_overrides => values_overrides/barbican}/tls-offloading.yaml (100%)
 rename {barbican/values_overrides => values_overrides/barbican}/tls.yaml (100%)
 rename {barbican/values_overrides => values_overrides/barbican}/victoria-ubuntu_focal.yaml (100%)
 rename {barbican/values_overrides => values_overrides/barbican}/wallaby-ubuntu_focal.yaml (100%)
 rename {barbican/values_overrides => values_overrides/barbican}/xena-ubuntu_focal.yaml (100%)
 rename {barbican/values_overrides => values_overrides/barbican}/yoga-ubuntu_focal.yaml (100%)
 rename {barbican/values_overrides => values_overrides/barbican}/zed-ubuntu_focal.yaml (100%)
 rename {barbican/values_overrides => values_overrides/barbican}/zed-ubuntu_jammy.yaml (100%)
 rename {ceilometer/values_overrides => values_overrides/ceilometer}/annotations.yaml (100%)
 rename {cinder/values_overrides => values_overrides/cinder}/2023.1-ubuntu_focal.yaml (100%)
 rename {cinder/values_overrides => values_overrides/cinder}/2023.1-ubuntu_jammy.yaml (100%)
 rename {cinder/values_overrides => values_overrides/cinder}/2023.2-ubuntu_jammy.yaml (100%)
 rename {cinder/values_overrides => values_overrides/cinder}/2024.1-ubuntu_jammy.yaml (100%)
 rename {cinder/values_overrides => values_overrides/cinder}/2024.2-ubuntu_jammy.yaml (100%)
 rename {cinder/values_overrides => values_overrides/cinder}/annotations.yaml (100%)
 rename {cinder/values_overrides => values_overrides/cinder}/apparmor.yaml (100%)
 rename {cinder/values_overrides => values_overrides/cinder}/backend_pure.yaml (100%)
 rename {cinder/values_overrides => values_overrides/cinder}/external-ceph-backend.yaml (100%)
 rename {cinder/values_overrides => values_overrides/cinder}/external-ceph-configmap.yaml (100%)
 rename {cinder/values_overrides => values_overrides/cinder}/netpol.yaml (100%)
 rename {cinder/values_overrides => values_overrides/cinder}/nfs-cinder-backup.yaml (100%)
 rename {cinder/values_overrides => values_overrides/cinder}/qos.yaml (100%)
 rename {cinder/values_overrides => values_overrides/cinder}/tls-offloading.yaml (100%)
 rename {cinder/values_overrides => values_overrides/cinder}/tls.yaml (100%)
 rename {cinder/values_overrides => values_overrides/cinder}/victoria-ubuntu_focal.yaml (100%)
 rename {cinder/values_overrides => values_overrides/cinder}/wallaby-ubuntu_focal.yaml (100%)
 rename {cinder/values_overrides => values_overrides/cinder}/xena-ubuntu_focal.yaml (100%)
 rename {cinder/values_overrides => values_overrides/cinder}/yoga-ubuntu_focal.yaml (100%)
 rename {cinder/values_overrides => values_overrides/cinder}/zed-ubuntu_focal.yaml (100%)
 rename {cinder/values_overrides => values_overrides/cinder}/zed-ubuntu_jammy.yaml (100%)
 rename {cyborg/values_overrides => values_overrides/cyborg}/annotations.yaml (100%)
 rename {designate/values_overrides => values_overrides/designate}/annotations.yaml (100%)
 rename {glance/values_overrides => values_overrides/glance}/2023.1-ubuntu_focal.yaml (100%)
 rename {glance/values_overrides => values_overrides/glance}/2023.1-ubuntu_jammy.yaml (100%)
 rename {glance/values_overrides => values_overrides/glance}/2023.2-ubuntu_jammy.yaml (100%)
 rename {glance/values_overrides => values_overrides/glance}/2024.1-ubuntu_jammy.yaml (100%)
 rename {glance/values_overrides => values_overrides/glance}/2024.2-ubuntu_jammy.yaml (100%)
 rename {glance/values_overrides => values_overrides/glance}/annotations.yaml (100%)
 rename {glance/values_overrides => values_overrides/glance}/apparmor.yaml (100%)
 rename {glance/values_overrides => values_overrides/glance}/bootstrap-ubuntu-image.yaml (100%)
 rename {glance/values_overrides => values_overrides/glance}/netpol.yaml (100%)
 rename {glance/values_overrides => values_overrides/glance}/tls-offloading.yaml (100%)
 rename {glance/values_overrides => values_overrides/glance}/tls.yaml (100%)
 rename {glance/values_overrides => values_overrides/glance}/victoria-ubuntu_focal.yaml (100%)
 rename {glance/values_overrides => values_overrides/glance}/wallaby-ubuntu_focal.yaml (100%)
 rename {glance/values_overrides => values_overrides/glance}/xena-ubuntu_focal.yaml (100%)
 rename {glance/values_overrides => values_overrides/glance}/yoga-ubuntu_focal.yaml (100%)
 rename {glance/values_overrides => values_overrides/glance}/zed-ubuntu_focal.yaml (100%)
 rename {glance/values_overrides => values_overrides/glance}/zed-ubuntu_jammy.yaml (100%)
 rename {heat/values_overrides => values_overrides/heat}/2023.1-ubuntu_focal.yaml (100%)
 rename {heat/values_overrides => values_overrides/heat}/2023.1-ubuntu_jammy.yaml (100%)
 rename {heat/values_overrides => values_overrides/heat}/2023.2-ubuntu_jammy.yaml (100%)
 rename {heat/values_overrides => values_overrides/heat}/2024.1-ubuntu_jammy.yaml (100%)
 rename {heat/values_overrides => values_overrides/heat}/2024.2-ubuntu_jammy.yaml (100%)
 rename {heat/values_overrides => values_overrides/heat}/annotations.yaml (100%)
 rename {heat/values_overrides => values_overrides/heat}/apparmor.yaml (100%)
 rename {heat/values_overrides => values_overrides/heat}/netpol.yaml (100%)
 rename {heat/values_overrides => values_overrides/heat}/tls-offloading.yaml (100%)
 rename {heat/values_overrides => values_overrides/heat}/tls.yaml (100%)
 rename {heat/values_overrides => values_overrides/heat}/victoria-ubuntu_focal.yaml (100%)
 rename {heat/values_overrides => values_overrides/heat}/wallaby-ubuntu_focal.yaml (100%)
 rename {heat/values_overrides => values_overrides/heat}/xena-ubuntu_focal.yaml (100%)
 rename {heat/values_overrides => values_overrides/heat}/yoga-ubuntu_focal.yaml (100%)
 rename {heat/values_overrides => values_overrides/heat}/zed-ubuntu_focal.yaml (100%)
 rename {heat/values_overrides => values_overrides/heat}/zed-ubuntu_jammy.yaml (100%)
 rename {horizon/values_overrides => values_overrides/horizon}/2023.1-ubuntu_focal.yaml (100%)
 rename {horizon/values_overrides => values_overrides/horizon}/2023.1-ubuntu_jammy.yaml (100%)
 rename {horizon/values_overrides => values_overrides/horizon}/2023.2-ubuntu_jammy.yaml (100%)
 rename {horizon/values_overrides => values_overrides/horizon}/2024.1-ubuntu_jammy.yaml (100%)
 rename {horizon/values_overrides => values_overrides/horizon}/2024.2-ubuntu_jammy.yaml (100%)
 rename {horizon/values_overrides => values_overrides/horizon}/annotations.yaml (100%)
 rename {horizon/values_overrides => values_overrides/horizon}/apparmor.yaml (100%)
 rename {horizon/values_overrides => values_overrides/horizon}/logo.yaml (100%)
 rename {horizon/values_overrides => values_overrides/horizon}/netpol.yaml (100%)
 rename {horizon/values_overrides => values_overrides/horizon}/tls.yaml (100%)
 rename {horizon/values_overrides => values_overrides/horizon}/victoria-ubuntu_focal.yaml (100%)
 rename {horizon/values_overrides => values_overrides/horizon}/wallaby-ubuntu_focal.yaml (100%)
 rename {horizon/values_overrides => values_overrides/horizon}/xena-ubuntu_focal.yaml (100%)
 rename {horizon/values_overrides => values_overrides/horizon}/yoga-ubuntu_focal.yaml (100%)
 rename {horizon/values_overrides => values_overrides/horizon}/zed-ubuntu_focal.yaml (100%)
 rename {horizon/values_overrides => values_overrides/horizon}/zed-ubuntu_jammy.yaml (100%)
 rename {ironic/values_overrides => values_overrides/ironic}/annotations.yaml (100%)
 rename {ironic/values_overrides => values_overrides/ironic}/standalone.yaml (100%)
 rename {keystone/values_overrides => values_overrides/keystone}/2023.1-ubuntu_focal.yaml (100%)
 rename {keystone/values_overrides => values_overrides/keystone}/2023.1-ubuntu_jammy.yaml (100%)
 rename {keystone/values_overrides => values_overrides/keystone}/2023.2-ubuntu_jammy.yaml (100%)
 rename {keystone/values_overrides => values_overrides/keystone}/2024.1-ubuntu_jammy.yaml (100%)
 rename {keystone/values_overrides => values_overrides/keystone}/2024.2-ubuntu_jammy.yaml (100%)
 rename {keystone/values_overrides => values_overrides/keystone}/annotations.yaml (100%)
 rename {keystone/values_overrides => values_overrides/keystone}/apparmor.yaml (100%)
 rename {keystone/values_overrides => values_overrides/keystone}/internal-reverse-proxy.yaml (100%)
 rename {keystone/values_overrides => values_overrides/keystone}/ldap.yaml (100%)
 rename {keystone/values_overrides => values_overrides/keystone}/netpol.yaml (100%)
 rename {keystone/values_overrides => values_overrides/keystone}/tls-custom.yaml (100%)
 rename {keystone/values_overrides => values_overrides/keystone}/tls.yaml (100%)
 rename {keystone/values_overrides => values_overrides/keystone}/victoria-ubuntu_focal.yaml (100%)
 rename {keystone/values_overrides => values_overrides/keystone}/wallaby-ubuntu_focal.yaml (100%)
 rename {keystone/values_overrides => values_overrides/keystone}/xena-ubuntu_focal.yaml (100%)
 rename {keystone/values_overrides => values_overrides/keystone}/yoga-ubuntu_focal.yaml (100%)
 rename {keystone/values_overrides => values_overrides/keystone}/zed-ubuntu_focal.yaml (100%)
 rename {keystone/values_overrides => values_overrides/keystone}/zed-ubuntu_jammy.yaml (100%)
 rename {magnum/values_overrides => values_overrides/magnum}/annotations.yaml (100%)
 rename {manila/values_overrides => values_overrides/manila}/2023.1-ubuntu_focal.yaml (100%)
 rename {manila/values_overrides => values_overrides/manila}/2023.1-ubuntu_jammy.yaml (100%)
 rename {manila/values_overrides => values_overrides/manila}/2023.2-ubuntu_jammy.yaml (100%)
 rename {manila/values_overrides => values_overrides/manila}/2024.1-ubuntu_jammy.yaml (100%)
 rename {manila/values_overrides => values_overrides/manila}/2024.2-ubuntu_jammy.yaml (100%)
 rename {manila/values_overrides => values_overrides/manila}/annotations.yaml (100%)
 rename {manila/values_overrides => values_overrides/manila}/apparmor.yaml (100%)
 rename {manila/values_overrides => values_overrides/manila}/tls-offloading.yaml (100%)
 rename {manila/values_overrides => values_overrides/manila}/tls.yaml (100%)
 rename {manila/values_overrides => values_overrides/manila}/xena-ubuntu_focal.yaml (100%)
 rename {manila/values_overrides => values_overrides/manila}/yoga-ubuntu_focal.yaml (100%)
 rename {manila/values_overrides => values_overrides/manila}/zed-ubuntu_focal.yaml (100%)
 rename {manila/values_overrides => values_overrides/manila}/zed-ubuntu_jammy.yaml (100%)
 rename {masakari/values_overrides => values_overrides/masakari}/annotations.yaml (100%)
 rename {mistral/values_overrides => values_overrides/mistral}/annotations.yaml (100%)
 rename {monasca/values_overrides => values_overrides/monasca}/annotations.yaml (100%)
 rename {monasca/values_overrides => values_overrides/monasca}/libvirt.yaml (100%)
 rename {monasca/values_overrides => values_overrides/monasca}/nvidia.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/2023.1-ubuntu_focal.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/2023.1-ubuntu_jammy.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/2023.2-ubuntu_jammy.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/2024.1-ubuntu_jammy.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/2024.2-ubuntu_jammy.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/annotations.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/apparmor.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/bagpipe_bgp.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/dpdk-bond.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/dpdk.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/gate.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/l2gateway.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/netpol.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/ovn.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/ovn_vpn.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/shared-sriov-ovs-dpdk-bond.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/tf.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/tls-offloading.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/tls.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/victoria-ubuntu_focal.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/wallaby-ubuntu_focal.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/xena-ubuntu_focal.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/yoga-ubuntu_focal.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/zed-ubuntu_focal.yaml (100%)
 rename {neutron/values_overrides => values_overrides/neutron}/zed-ubuntu_jammy.yaml (100%)
 rename {nova/values_overrides => values_overrides/nova}/2023.1-ubuntu_focal.yaml (100%)
 rename {nova/values_overrides => values_overrides/nova}/2023.1-ubuntu_jammy.yaml (100%)
 rename {nova/values_overrides => values_overrides/nova}/2023.2-ubuntu_jammy.yaml (100%)
 rename {nova/values_overrides => values_overrides/nova}/2024.1-ubuntu_jammy.yaml (100%)
 rename {nova/values_overrides => values_overrides/nova}/2024.2-ubuntu_jammy.yaml (100%)
 rename {nova/values_overrides => values_overrides/nova}/annotations.yaml (100%)
 rename {nova/values_overrides => values_overrides/nova}/apparmor.yaml (100%)
 rename {nova/values_overrides => values_overrides/nova}/cntt.yaml (100%)
 rename {nova/values_overrides => values_overrides/nova}/dpdk.yaml (100%)
 rename {nova/values_overrides => values_overrides/nova}/netpol.yaml (100%)
 rename {nova/values_overrides => values_overrides/nova}/opensuse_15.yaml (100%)
 rename {nova/values_overrides => values_overrides/nova}/ovn.yaml (100%)
 rename {nova/values_overrides => values_overrides/nova}/ssh.yaml (100%)
 rename {nova/values_overrides => values_overrides/nova}/tf.yaml (100%)
 rename {nova/values_overrides => values_overrides/nova}/tls-offloading.yaml (100%)
 rename {nova/values_overrides => values_overrides/nova}/tls.yaml (100%)
 rename {nova/values_overrides => values_overrides/nova}/victoria-ubuntu_focal.yaml (100%)
 rename {nova/values_overrides => values_overrides/nova}/wallaby-ubuntu_focal.yaml (100%)
 rename {nova/values_overrides => values_overrides/nova}/xena-ubuntu_focal.yaml (100%)
 rename {nova/values_overrides => values_overrides/nova}/yoga-ubuntu_focal.yaml (100%)
 rename {nova/values_overrides => values_overrides/nova}/zed-ubuntu_focal.yaml (100%)
 rename {nova/values_overrides => values_overrides/nova}/zed-ubuntu_jammy.yaml (100%)
 rename {octavia/values_overrides => values_overrides/octavia}/annotations.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/glance/2023.1-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/glance/2023.1-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/glance/2023.2-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/glance/2024.1-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/glance/2024.2-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/glance/apparmor.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/glance/netpol.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/glance/tls.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/glance/victoria-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/glance/wallaby-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/glance/zed-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/glance/zed-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/heat/2023.1-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/heat/2023.1-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/heat/2023.2-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/heat/2024.1-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/heat/2024.2-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/heat/apparmor.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/heat/netpol.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/heat/tls.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/heat/victoria-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/heat/wallaby-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/heat/zed-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/heat/zed-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/horizon/2023.1-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/horizon/2023.1-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/horizon/2023.2-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/horizon/2024.1-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/horizon/2024.2-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/horizon/apparmor.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/horizon/netpol.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/horizon/tls.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/horizon/victoria-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/horizon/wallaby-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/horizon/xena-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/horizon/yoga-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/horizon/zed-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/horizon/zed-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/keystone/2023.1-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/keystone/2023.1-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/keystone/2023.2-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/keystone/2024.1-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/keystone/2024.2-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/keystone/apparmor.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/keystone/ldap.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/keystone/netpol.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/keystone/tls.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/keystone/victoria-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/keystone/wallaby-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/keystone/zed-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/keystone/zed-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/libvirt/2023.1-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/libvirt/2023.1-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/libvirt/2023.2-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/libvirt/2024.1-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/libvirt/2024.2-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/libvirt/apparmor.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/libvirt/cinder-external-ceph-backend.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/libvirt/netpol.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/libvirt/ssl.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/libvirt/victoria-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/libvirt/wallaby-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/libvirt/zed-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/libvirt/zed-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/mariadb/apparmor.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/mariadb/local-storage.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/mariadb/netpol.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/mariadb/tls.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/memcached/apparmor.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/memcached/netpol.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/neutron/2023.1-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/neutron/2023.1-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/neutron/2023.2-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/neutron/2024.1-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/neutron/2024.2-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/neutron/apparmor.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/neutron/dpdk-bond.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/neutron/dpdk.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/neutron/gate.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/neutron/netpol.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/neutron/shared-sriov-ovs-dpdk-bond.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/neutron/tf.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/neutron/tls.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/neutron/victoria-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/neutron/wallaby-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/neutron/zed-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/neutron/zed-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/nova/2023.1-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/nova/2023.1-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/nova/2023.2-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/nova/2024.1-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/nova/2024.2-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/nova/apparmor.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/nova/cntt.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/nova/netpol.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/nova/opensuse_15.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/nova/ssh.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/nova/tf.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/nova/tls-offloading.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/nova/tls.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/nova/victoria-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/nova/wallaby-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/nova/wallaby.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/nova/zed-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/nova/zed-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/openvswitch/apparmor.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/openvswitch/dpdk-opensuse_15.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/openvswitch/dpdk-ubuntu_bionic.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/openvswitch/netpol.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/openvswitch/vswitchd-probes.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/placement/2023.1-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/placement/2023.1-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/placement/2023.2-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/placement/2024.1-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/placement/2024.2-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/placement/apparmor.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/placement/netpol.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/placement/tls.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/placement/train-ubuntu_bionic.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/placement/victoria-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/placement/wallaby-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/placement/zed-ubuntu_focal.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/placement/zed-ubuntu_jammy.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/rabbitmq/apparmor.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/rabbitmq/netpol.yaml (100%)
 rename {openstack/values_overrides => values_overrides/openstack}/rabbitmq/tls.yaml (100%)
 rename {placement/values_overrides => values_overrides/placement}/2023.1-ubuntu_focal.yaml (100%)
 rename {placement/values_overrides => values_overrides/placement}/2023.1-ubuntu_jammy.yaml (100%)
 rename {placement/values_overrides => values_overrides/placement}/2023.2-ubuntu_jammy.yaml (100%)
 rename {placement/values_overrides => values_overrides/placement}/2024.1-ubuntu_jammy.yaml (100%)
 rename {placement/values_overrides => values_overrides/placement}/2024.2-ubuntu_jammy.yaml (100%)
 rename {placement/values_overrides => values_overrides/placement}/annotations.yaml (100%)
 rename {placement/values_overrides => values_overrides/placement}/apparmor.yaml (100%)
 rename {placement/values_overrides => values_overrides/placement}/netpol.yaml (100%)
 rename {placement/values_overrides => values_overrides/placement}/tls-offloading.yaml (100%)
 rename {placement/values_overrides => values_overrides/placement}/tls.yaml (100%)
 rename {placement/values_overrides => values_overrides/placement}/victoria-ubuntu_focal.yaml (100%)
 rename {placement/values_overrides => values_overrides/placement}/wallaby-ubuntu_focal.yaml (100%)
 rename {placement/values_overrides => values_overrides/placement}/xena-ubuntu_focal.yaml (100%)
 rename {placement/values_overrides => values_overrides/placement}/yoga-ubuntu_focal.yaml (100%)
 rename {placement/values_overrides => values_overrides/placement}/zed-ubuntu_focal.yaml (100%)
 rename {placement/values_overrides => values_overrides/placement}/zed-ubuntu_jammy.yaml (100%)
 rename {rally/values_overrides => values_overrides/rally}/annotations.yaml (100%)
 rename {rally/values_overrides => values_overrides/rally}/tls-offloading.yaml (100%)
 rename {senlin/values_overrides => values_overrides/senlin}/annotations.yaml (100%)
 rename {tacker/values_overrides => values_overrides/tacker}/2023.1-ubuntu_focal.yaml (100%)
 rename {tacker/values_overrides => values_overrides/tacker}/2023.1-ubuntu_jammy.yaml (100%)
 rename {tacker/values_overrides => values_overrides/tacker}/2023.2-ubuntu_jammy.yaml (100%)
 rename {tacker/values_overrides => values_overrides/tacker}/2024.1-ubuntu_jammy.yaml (100%)
 rename {tacker/values_overrides => values_overrides/tacker}/2024.2-ubuntu_jammy.yaml (100%)
 rename {tacker/values_overrides => values_overrides/tacker}/annotations.yaml (100%)
 rename {tacker/values_overrides => values_overrides/tacker}/zed-ubuntu_focal.yaml (100%)
 rename {tacker/values_overrides => values_overrides/tacker}/zed-ubuntu_jammy.yaml (100%)
 rename {tempest/values_overrides => values_overrides/tempest}/annotations.yaml (100%)

diff --git a/doc/source/install/openstack.rst b/doc/source/install/openstack.rst
index 09895b1478..a47c36a340 100644
--- a/doc/source/install/openstack.rst
+++ b/doc/source/install/openstack.rst
@@ -62,12 +62,12 @@ Let's download the values overrides for the feature set defined above:
 
 .. code-block:: bash
 
-    INFRA_OVERRIDES_URL=https://opendev.org/openstack/openstack-helm-infra/raw/branch/master
+    INFRA_OVERRIDES_URL=https://opendev.org/openstack/openstack-helm-infra/raw/branch/master/values_overrides
     for chart in rabbitmq mariadb memcached openvswitch libvirt; do
         helm osh get-values-overrides -d -u ${INFRA_OVERRIDES_URL} -p ${OVERRIDES_DIR} -c ${chart} ${FEATURES}
     done
 
-    OVERRIDES_URL=https://opendev.org/openstack/openstack-helm/raw/branch/master
+    OVERRIDES_URL=https://opendev.org/openstack/openstack-helm/raw/branch/master/values_overrides
     for chart in keystone heat glance cinder placement nova neutron horizon; do
         helm osh get-values-overrides -d -u ${OVERRIDES_URL} -p ${OVERRIDES_DIR} -c ${chart} ${FEATURES}
     done
diff --git a/doc/source/specs/2025.1/chart_versioning.rst b/doc/source/specs/2025.1/chart_versioning.rst
index 975abfcbfe..5cfd3d297c 100644
--- a/doc/source/specs/2025.1/chart_versioning.rst
+++ b/doc/source/specs/2025.1/chart_versioning.rst
@@ -85,7 +85,7 @@ implemented.
 Values overrides
 ~~~~~~~~~~~~~~~~
 Move values_overrides from all charts to a separate directory `values`
-with the hierarchy `values/<chart-name>/values_overrides/<feature1>_<feature2>.yaml`.
+with the hierarchy `values_overrides/<chart-name>/<feature1>_<feature2>.yaml`.
 The Openstack-Helm plugin is able to lookup the overrides in an arbitrary directory,
 but the directory structure must be as described above.
 
diff --git a/tools/deployment/common/lockdown-netpol.sh b/tools/deployment/common/lockdown-netpol.sh
index 16833b8666..4e7a96e4ea 100755
--- a/tools/deployment/common/lockdown-netpol.sh
+++ b/tools/deployment/common/lockdown-netpol.sh
@@ -15,8 +15,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
-: ${OSH_EXTRA_HELM_ARGS_LOCKDOWN:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c lockdown ${FEATURES})"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
+: ${OSH_EXTRA_HELM_ARGS_LOCKDOWN:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c lockdown ${FEATURES})"}
 
 #NOTE: Deploy command
 helm upgrade --install lockdown ${OSH_INFRA_HELM_REPO}/lockdown \
diff --git a/tools/deployment/common/openstack-exporter.sh b/tools/deployment/common/openstack-exporter.sh
index fb4fd01776..1f1b5f90a1 100755
--- a/tools/deployment/common/openstack-exporter.sh
+++ b/tools/deployment/common/openstack-exporter.sh
@@ -16,8 +16,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
-: ${OSH_EXTRA_HELM_ARGS_OSEXPORTER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c prometheus-openstack-exporter ${FEATURES})"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
+: ${OSH_EXTRA_HELM_ARGS_OSEXPORTER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c prometheus-openstack-exporter ${FEATURES})"}
 
 #NOTE: Deploy command
 helm upgrade --install prometheus-openstack-exporter ${OSH_INFRA_HELM_REPO}/prometheus-openstack-exporter \
diff --git a/tools/deployment/common/push-images.sh b/tools/deployment/common/push-images.sh
new file mode 100755
index 0000000000..718919159d
--- /dev/null
+++ b/tools/deployment/common/push-images.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+#set -x
+
+if [ "x$1" == "x" ]; then
+  CHART_DIRS="$(echo ./*/)"
+else
+  CHART_DIRS="$(echo ./$1/)"
+fi
+
+for CHART_DIR in ${CHART_DIRS} ; do
+#   echo $CHART_DIR
+  if [ -e ${CHART_DIR}values.yaml ]; then
+    for IMAGE in $(cat ${CHART_DIR}values.yaml | yq '.images.tags | map(.) | join(" ")' | tr -d '"'); do
+    #   sudo docker inspect $IMAGE >/dev/null|| sudo docker pull $IMAGE
+      echo $IMAGE
+    done
+  fi
+done
\ No newline at end of file
diff --git a/tools/deployment/component/aodh/aodh.sh b/tools/deployment/component/aodh/aodh.sh
index d465673acb..30101886c5 100755
--- a/tools/deployment/component/aodh/aodh.sh
+++ b/tools/deployment/component/aodh/aodh.sh
@@ -15,8 +15,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_PATH:="../openstack-helm"}
-: ${OSH_EXTRA_HELM_ARGS_AODH:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c aodh ${FEATURES})"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
+: ${OSH_EXTRA_HELM_ARGS_AODH:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c aodh ${FEATURES})"}
 
 #NOTE: Wait for deploy
 helm upgrade --install aodh ${OSH_HELM_REPO}/aodh \
diff --git a/tools/deployment/component/barbican/barbican.sh b/tools/deployment/component/barbican/barbican.sh
index 29b4c2196d..66ac7ac333 100755
--- a/tools/deployment/component/barbican/barbican.sh
+++ b/tools/deployment/component/barbican/barbican.sh
@@ -16,8 +16,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_PATH:="../openstack-helm"}
-: ${OSH_EXTRA_HELM_ARGS_BARBICAN:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c barbican ${FEATURES})"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
+: ${OSH_EXTRA_HELM_ARGS_BARBICAN:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c barbican ${FEATURES})"}
 : ${RUN_HELM_TESTS:="yes"}
 
 #NOTE: Deploy command
diff --git a/tools/deployment/component/ceilometer/ceilometer.sh b/tools/deployment/component/ceilometer/ceilometer.sh
index 8a9f6fbc38..29d2afb593 100755
--- a/tools/deployment/component/ceilometer/ceilometer.sh
+++ b/tools/deployment/component/ceilometer/ceilometer.sh
@@ -15,8 +15,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_PATH:="../openstack-helm"}
-: ${OSH_EXTRA_HELM_ARGS_CEILOMETER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c ceilometer ${FEATURES})"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
+: ${OSH_EXTRA_HELM_ARGS_CEILOMETER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c ceilometer ${FEATURES})"}
 
 #NOTE: Wait for deploy
 helm upgrade --install ceilometer ${OSH_HELM_REPO}/ceilometer \
diff --git a/tools/deployment/component/ceph/ceph-ns-activate.sh b/tools/deployment/component/ceph/ceph-ns-activate.sh
index 53fbe2f74e..7baea2987c 100755
--- a/tools/deployment/component/ceph/ceph-ns-activate.sh
+++ b/tools/deployment/component/ceph/ceph-ns-activate.sh
@@ -16,8 +16,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
-: ${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c ceph-provisioners ${FEATURES})"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
+: ${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c ceph-provisioners ${FEATURES})"}
 
 #NOTE: Deploy command
 tee /tmp/ceph-openstack-config.yaml <<EOF
diff --git a/tools/deployment/component/ceph/ceph.sh b/tools/deployment/component/ceph/ceph.sh
index 47177833ae..21f706007a 100755
--- a/tools/deployment/component/ceph/ceph.sh
+++ b/tools/deployment/component/ceph/ceph.sh
@@ -19,7 +19,7 @@ export CEPH_ENABLED=true
 : ${CEPH_OSD_DATA_DEVICE:="/dev/loop100"}
 : ${POD_NETWORK_CIDR:="10.244.0.0/24"}
 : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
 
 NUMBER_OF_OSDS="$(kubectl get nodes -l ceph-osd=enabled --no-headers | wc -l)"
 
@@ -181,7 +181,7 @@ for CHART in ceph-mon ceph-osd ceph-client ceph-provisioners; do
     --namespace=ceph \
     --values=/tmp/ceph.yaml \
     ${OSH_EXTRA_HELM_ARGS:=} \
-    ${OSH_EXTRA_HELM_ARGS_CEPH:-$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c ${CHART} ${FEATURES})}
+    ${OSH_EXTRA_HELM_ARGS_CEPH:-$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c ${CHART} ${FEATURES})}
 
   #NOTE: Wait for deploy
   helm osh wait-for-pods ceph
diff --git a/tools/deployment/component/cinder/cinder.sh b/tools/deployment/component/cinder/cinder.sh
index 7330488e2b..a6eaccdde9 100755
--- a/tools/deployment/component/cinder/cinder.sh
+++ b/tools/deployment/component/cinder/cinder.sh
@@ -15,8 +15,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_PATH:="../openstack-helm"}
-: ${OSH_EXTRA_HELM_ARGS_CINDER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c cinder ${FEATURES})"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
+: ${OSH_EXTRA_HELM_ARGS_CINDER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c cinder ${FEATURES})"}
 : ${RUN_HELM_TESTS:="yes"}
 
 #NOTE: Deploy command
diff --git a/tools/deployment/component/common/ldap.sh b/tools/deployment/component/common/ldap.sh
index 6fd766b0e4..18e8b0a125 100755
--- a/tools/deployment/component/common/ldap.sh
+++ b/tools/deployment/component/common/ldap.sh
@@ -16,8 +16,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
-: ${OSH_EXTRA_HELM_ARGS_LDAP:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c ldap ${FEATURES})"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
+: ${OSH_EXTRA_HELM_ARGS_LDAP:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c ldap ${FEATURES})"}
 
 #NOTE: Deploy command
 tee /tmp/ldap.yaml <<EOF
diff --git a/tools/deployment/component/common/mariadb.sh b/tools/deployment/component/common/mariadb.sh
index c5dbd34ddc..71891a6894 100755
--- a/tools/deployment/component/common/mariadb.sh
+++ b/tools/deployment/component/common/mariadb.sh
@@ -16,8 +16,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
-: ${OSH_EXTRA_HELM_ARGS_MARIADB:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c mariadb ${FEATURES})"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
+: ${OSH_EXTRA_HELM_ARGS_MARIADB:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c mariadb ${FEATURES})"}
 
 #NOTE: Deploy command
 helm upgrade --install mariadb ${OSH_INFRA_HELM_REPO}/mariadb \
diff --git a/tools/deployment/component/common/memcached.sh b/tools/deployment/component/common/memcached.sh
index 355a3f3e66..e18a2d1fa7 100755
--- a/tools/deployment/component/common/memcached.sh
+++ b/tools/deployment/component/common/memcached.sh
@@ -16,8 +16,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
-: ${OSH_EXTRA_HELM_ARGS_MEMCACHED:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c memcached ${FEATURES})"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
+: ${OSH_EXTRA_HELM_ARGS_MEMCACHED:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c memcached ${FEATURES})"}
 
 #NOTE: Deploy command
 helm upgrade --install memcached ${OSH_INFRA_HELM_REPO}/memcached \
diff --git a/tools/deployment/component/common/openstack.sh b/tools/deployment/component/common/openstack.sh
index 678ddddc59..cd3fc7915a 100755
--- a/tools/deployment/component/common/openstack.sh
+++ b/tools/deployment/component/common/openstack.sh
@@ -16,7 +16,7 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_PATH:="../openstack-helm"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
 export OS_CLOUD=openstack_helm
 : "${RUN_HELM_TESTS:="no"}"
 : "${CEPH_ENABLED:="false"}"
@@ -65,18 +65,18 @@ neutron:
         node_selector_value: enabled
 EOF
 ## includes second argument 'subchart' to indicate a different path
-: ${OSH_EXTRA_HELM_ARGS_MARIADB:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s mariadb ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_RABBITMQ:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s rabbitmq ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_MEMCACHED:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s memcached ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s keystone ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_HEAT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s heat ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_GLANCE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s glance ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s openvswitch ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_LIBVIRT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s libvirt ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s nova ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s placement ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s neutron ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_HORIZON:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s horizon ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_MARIADB:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s mariadb ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_RABBITMQ:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s rabbitmq ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_MEMCACHED:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s memcached ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s keystone ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_HEAT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s heat ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_GLANCE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s glance ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s openvswitch ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_LIBVIRT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s libvirt ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s nova ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s placement ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s neutron ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_HORIZON:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s horizon ${FEATURES})"}
 
 if [ "x$(systemd-detect-virt)" != "xnone" ]; then
   echo 'OSH is being deployed in virtualized environment, using qemu for nova'
diff --git a/tools/deployment/component/common/rabbitmq.sh b/tools/deployment/component/common/rabbitmq.sh
index 9035db24c6..8110f2c780 100755
--- a/tools/deployment/component/common/rabbitmq.sh
+++ b/tools/deployment/component/common/rabbitmq.sh
@@ -16,8 +16,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
-: ${OSH_EXTRA_HELM_ARGS_RABBITMQ:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c rabbitmq ${FEATURES})"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
+: ${OSH_EXTRA_HELM_ARGS_RABBITMQ:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c rabbitmq ${FEATURES})"}
 
 #NOTE: Deploy command
 helm upgrade --install rabbitmq ${OSH_INFRA_HELM_REPO}/rabbitmq \
diff --git a/tools/deployment/component/compute-kit/compute-kit.sh b/tools/deployment/component/compute-kit/compute-kit.sh
index bda341eabe..e75dec3dcb 100755
--- a/tools/deployment/component/compute-kit/compute-kit.sh
+++ b/tools/deployment/component/compute-kit/compute-kit.sh
@@ -15,10 +15,10 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_PATH:="../openstack-helm"}
-: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c placement ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c nova ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c neutron ${FEATURES})"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
+: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c placement ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c nova ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c neutron ${FEATURES})"}
 : ${RUN_HELM_TESTS:="yes"}
 
 export OS_CLOUD=openstack_helm
diff --git a/tools/deployment/component/compute-kit/libvirt.sh b/tools/deployment/component/compute-kit/libvirt.sh
index 2edf15c481..494ceff173 100755
--- a/tools/deployment/component/compute-kit/libvirt.sh
+++ b/tools/deployment/component/compute-kit/libvirt.sh
@@ -22,8 +22,8 @@ fi
 
 #NOTE: Define variables
 : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
-: ${OSH_EXTRA_HELM_ARGS_LIBVIRT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c libvirt ${FEATURES})"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
+: ${OSH_EXTRA_HELM_ARGS_LIBVIRT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c libvirt ${FEATURES})"}
 
 #NOTE: Deploy command
 helm upgrade --install libvirt ${OSH_INFRA_HELM_REPO}/libvirt \
diff --git a/tools/deployment/component/compute-kit/openvswitch.sh b/tools/deployment/component/compute-kit/openvswitch.sh
index 759b5111bc..c9e5b49069 100755
--- a/tools/deployment/component/compute-kit/openvswitch.sh
+++ b/tools/deployment/component/compute-kit/openvswitch.sh
@@ -15,8 +15,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
-: ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c openvswitch ${FEATURES})"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
+: ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c openvswitch ${FEATURES})"}
 
 #NOTE: Deploy command
 helm upgrade --install openvswitch ${OSH_INFRA_HELM_REPO}/openvswitch \
diff --git a/tools/deployment/component/glance/glance.sh b/tools/deployment/component/glance/glance.sh
index 6d98c164b7..fef03d94e2 100755
--- a/tools/deployment/component/glance/glance.sh
+++ b/tools/deployment/component/glance/glance.sh
@@ -16,8 +16,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_PATH:="../openstack-helm"}
-: ${OSH_EXTRA_HELM_ARGS_GLANCE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c glance ${FEATURES})"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
+: ${OSH_EXTRA_HELM_ARGS_GLANCE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c glance ${FEATURES})"}
 : ${RUN_HELM_TESTS:="yes"}
 : ${GLANCE_BACKEND:="pvc"}
 
diff --git a/tools/deployment/component/heat/heat.sh b/tools/deployment/component/heat/heat.sh
index 81bd0005a8..9a03d33335 100755
--- a/tools/deployment/component/heat/heat.sh
+++ b/tools/deployment/component/heat/heat.sh
@@ -15,8 +15,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_PATH:="../openstack-helm"}
-: ${OSH_EXTRA_HELM_ARGS_HEAT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c heat ${FEATURES})"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
+: ${OSH_EXTRA_HELM_ARGS_HEAT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c heat ${FEATURES})"}
 
 #NOTE: Deploy command
 helm upgrade --install heat ${OSH_HELM_REPO}/heat \
diff --git a/tools/deployment/component/horizon/horizon.sh b/tools/deployment/component/horizon/horizon.sh
index b7094a6994..e3101c6eb1 100755
--- a/tools/deployment/component/horizon/horizon.sh
+++ b/tools/deployment/component/horizon/horizon.sh
@@ -16,8 +16,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_PATH:="../openstack-helm"}
-: ${OSH_EXTRA_HELM_ARGS_HORIZON:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c horizon ${FEATURES})"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
+: ${OSH_EXTRA_HELM_ARGS_HORIZON:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c horizon ${FEATURES})"}
 : ${RUN_HELM_TESTS:="yes"}
 
 #NOTE: Deploy command
diff --git a/tools/deployment/component/keystone/keystone.sh b/tools/deployment/component/keystone/keystone.sh
index ac34b9bbc0..3c7523ba9b 100755
--- a/tools/deployment/component/keystone/keystone.sh
+++ b/tools/deployment/component/keystone/keystone.sh
@@ -16,8 +16,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_PATH:="../openstack-helm"}
-: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c keystone ${FEATURES})"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
+: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c keystone ${FEATURES})"}
 : ${RUN_HELM_TESTS:="no"}
 
 #NOTE: Deploy command
diff --git a/tools/deployment/component/magnum/magnum.sh b/tools/deployment/component/magnum/magnum.sh
index e775c5ec72..d44dd2171b 100755
--- a/tools/deployment/component/magnum/magnum.sh
+++ b/tools/deployment/component/magnum/magnum.sh
@@ -13,8 +13,14 @@
 #    under the License.
 set -xe
 
+#NOTE: Define variables
+: ${OSH_HELM_REPO:="../openstack-helm"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
+: ${OSH_EXTRA_HELM_ARGS_MAGNUM:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c magnum ${FEATURES})"}
+: ${RUN_HELM_TESTS:="yes"}
+
 #NOTE: Deploy command
-helm upgrade --install magnum ./magnum \
+helm upgrade --install magnum ${OSH_HELM_REPO}/magnum \
   --namespace=openstack \
   --set pod.replicas.api=2 \
   --set pod.replicas.conductor=2 \
diff --git a/tools/deployment/component/manila/manila.sh b/tools/deployment/component/manila/manila.sh
index 9951ba7c65..4d2b5efc15 100755
--- a/tools/deployment/component/manila/manila.sh
+++ b/tools/deployment/component/manila/manila.sh
@@ -14,12 +14,14 @@
 
 set -xe
 
-#NOTE: Get the over-rides to use
-: ${OSH_EXTRA_HELM_ARGS_MANILA:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -c manila ${FEATURES})"}
+#NOTE: Define variables
+: ${OSH_HELM_REPO:="../openstack-helm"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
+: ${OSH_EXTRA_HELM_ARGS_MANILA:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-}  -p ${OSH_VALUES_OVERRIDES_PATH} -c manila ${FEATURES})"}
 : ${RUN_HELM_TESTS:="no"}
 
 #NOTE: Deploy command
-helm upgrade --install --debug manila ./manila \
+helm upgrade --install --debug manila ${OSH_HELM_REPO}/manila \
     --namespace=openstack \
     ${OSH_EXTRA_HELM_ARGS:=} \
     ${OSH_EXTRA_HELM_ARGS_MANILA:=}
diff --git a/tools/deployment/component/mistral/mistral.sh b/tools/deployment/component/mistral/mistral.sh
index 2bc06fca13..028ea88cf0 100755
--- a/tools/deployment/component/mistral/mistral.sh
+++ b/tools/deployment/component/mistral/mistral.sh
@@ -13,10 +13,14 @@
 #    under the License.
 set -xe
 
+#NOTE: Define variables
+: ${OSH_HELM_REPO:="../openstack-helm"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
+: ${OSH_EXTRA_HELM_ARGS_MISTRAL:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c mistral ${FEATURES})"}
 : ${RUN_HELM_TESTS:="yes"}
 
 #NOTE: Deploy command
-helm upgrade --install mistral ./mistral \
+helm upgrade --install mistral ${OSH_HELM_REPO}/mistral \
   --namespace=openstack \
   --set pod.replicas.api=2 \
   --set pod.replicas.engine=2 \
diff --git a/tools/deployment/component/nfs-provisioner/nfs-provisioner.sh b/tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
index 2540e2808c..4ba9d1c71f 100755
--- a/tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
+++ b/tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
@@ -14,6 +14,11 @@
 
 set -xe
 
+#NOTE: Define variables
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
+: ${OSH_EXTRA_HELM_ARGS_NFS_PROVISIONER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c nfs-provisioner ${FEATURES})"}
+
 tee /tmp/nfs-ns.yaml << EOF
 apiVersion: v1
 kind: Namespace
@@ -27,8 +32,7 @@ EOF
 kubectl create -f /tmp/nfs-ns.yaml
 
 #NOTE: Deploy command
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
-helm upgrade --install nfs-provisioner ${OSH_INFRA_PATH}/nfs-provisioner \
+helm upgrade --install nfs-provisioner ${OSH_INFRA_HELM_REPO}/nfs-provisioner \
     --namespace=nfs \
     --set storageclass.name=general \
     ${OSH_EXTRA_HELM_ARGS_NFS_PROVISIONER}
diff --git a/tools/deployment/component/ovn/120-openvswitch.sh b/tools/deployment/component/ovn/120-openvswitch.sh
deleted file mode 100755
index 689fc07e98..0000000000
--- a/tools/deployment/component/ovn/120-openvswitch.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-set -xe
-
-export FEATURE_GATES="ovn"
-
-#NOTE: Get the over-rides to use
-export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
-: ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${HELM_CHART_ROOT_PATH} -c openvswitch ${FEATURES})"}
-
-#NOTE: Deploy command
-: ${OSH_EXTRA_HELM_ARGS:=""}
-helm upgrade --install openvswitch ${HELM_CHART_ROOT_PATH}/openvswitch \
-  --namespace=openstack \
-  ${OSH_EXTRA_HELM_ARGS} \
-  ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH}
-
-#NOTE: Wait for deploy
-helm osh wait-for-pods openstack
diff --git a/tools/deployment/component/ovn/140-compute-kit.sh b/tools/deployment/component/ovn/140-compute-kit.sh
deleted file mode 100755
index 7083b292d8..0000000000
--- a/tools/deployment/component/ovn/140-compute-kit.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-set -xe
-
-export FEATURE_GATES="ovn"
-
-: ${RUN_HELM_TESTS:="yes"}
-
-#NOTE: Get the over-rides to use
-: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -c nova ${FEATURES})"}
-
-tee /tmp/pvc-ceph-client-key.yaml << EOF
-AQAk//BhgQMXDxAAPwH86gbDjEEpmXC4s2ontw==
-EOF
-kubectl -n openstack create secret generic pvc-ceph-client-key --from-file=key=/tmp/pvc-ceph-client-key.yaml || true
-rm -f /tmp/pvc-ceph-client-key.yaml
-
-helm upgrade --install nova ./nova \
-    --namespace=openstack \
-    ${OSH_EXTRA_HELM_ARGS:=} \
-    ${OSH_EXTRA_HELM_ARGS_NOVA}
-
-# Get overrides
-: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -c placement ${FEATURES})"}
-
-# Deploy
-helm upgrade --install placement ./placement \
-    --namespace=openstack \
-    ${OSH_EXTRA_HELM_ARGS:=} \
-    ${OSH_EXTRA_HELM_ARGS_PLACEMENT}
-
-#NOTE: Get the over-rides to use
-: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -c neutron ${FEATURES})"}
-
-helm upgrade --install neutron ./neutron \
-    --namespace=openstack \
-    ${OSH_RELEASE_OVERRIDES_NEUTRON} \
-    ${OSH_EXTRA_HELM_ARGS} \
-    ${OSH_EXTRA_HELM_ARGS_NEUTRON}
-
-#NOTE: Wait for deploy
-helm osh wait-for-pods openstack
-
-./tools/deployment/common/run-helm-tests.sh nova
-./tools/deployment/common/run-helm-tests.sh neutron
diff --git a/tools/deployment/component/ovn/ovn.sh b/tools/deployment/component/ovn/ovn.sh
index b5fb576b37..c1819afce7 100755
--- a/tools/deployment/component/ovn/ovn.sh
+++ b/tools/deployment/component/ovn/ovn.sh
@@ -13,11 +13,10 @@
 #    under the License.
 set -xe
 
-export FEATURE_GATES="ovn"
-
-#NOTE: Get the over-rides to use
-export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
-: ${OSH_EXTRA_HELM_ARGS_OVN:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${HELM_CHART_ROOT_PATH} -c ovn ${FEATURES})"}
+#NOTE: Define variables
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
+: ${OSH_EXTRA_HELM_ARGS_OVN:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c ovn ${FEATURES})"}
 
 tee /tmp/ovn.yaml << EOF
 volume:
@@ -36,7 +35,7 @@ EOF
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
-helm upgrade --install ovn ${HELM_CHART_ROOT_PATH}/ovn \
+helm upgrade --install ovn ${OSH_INFRA_HELM_REPO}/ovn \
   --namespace=openstack \
   --values=/tmp/ovn.yaml \
   ${OSH_EXTRA_HELM_ARGS} \
diff --git a/tools/deployment/component/senlin/senlin.sh b/tools/deployment/component/senlin/senlin.sh
index ef0d5af658..5b305eb303 100755
--- a/tools/deployment/component/senlin/senlin.sh
+++ b/tools/deployment/component/senlin/senlin.sh
@@ -13,8 +13,14 @@
 #    under the License.
 set -xe
 
+#NOTE: Define variables
+: ${OSH_HELM_REPO:="../openstack-helm"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
+: ${OSH_EXTRA_HELM_ARGS_SENLIN:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c senlin ${FEATURES})"}
+: ${RUN_HELM_TESTS:="yes"}
+
 #NOTE: Deploy command
-helm upgrade --install senlin ./senlin \
+helm upgrade --install senlin ${OSH_HELM_REPO}/senlin \
   --namespace=openstack \
   --set pod.replicas.api=2 \
   --set pod.replicas.engine=2 \
diff --git a/tools/deployment/component/tacker/tacker.sh b/tools/deployment/component/tacker/tacker.sh
index f5c0af2619..0adf77f5b3 100755
--- a/tools/deployment/component/tacker/tacker.sh
+++ b/tools/deployment/component/tacker/tacker.sh
@@ -15,8 +15,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_PATH:="../openstack-helm"}
-: ${OSH_EXTRA_HELM_ARGS_TACKER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c tacker ${FEATURES})"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
+: ${OSH_EXTRA_HELM_ARGS_TACKER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c tacker ${FEATURES})"}
 : ${RUN_HELM_TESTS:="no"}
 
 #NOTE: Deploy command
diff --git a/aodh/values_overrides/annotations.yaml b/values_overrides/aodh/annotations.yaml
similarity index 100%
rename from aodh/values_overrides/annotations.yaml
rename to values_overrides/aodh/annotations.yaml
diff --git a/barbican/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/barbican/2023.1-ubuntu_focal.yaml
similarity index 100%
rename from barbican/values_overrides/2023.1-ubuntu_focal.yaml
rename to values_overrides/barbican/2023.1-ubuntu_focal.yaml
diff --git a/barbican/values_overrides/2023.1-ubuntu_jammy.yaml b/values_overrides/barbican/2023.1-ubuntu_jammy.yaml
similarity index 100%
rename from barbican/values_overrides/2023.1-ubuntu_jammy.yaml
rename to values_overrides/barbican/2023.1-ubuntu_jammy.yaml
diff --git a/barbican/values_overrides/2023.2-ubuntu_jammy.yaml b/values_overrides/barbican/2023.2-ubuntu_jammy.yaml
similarity index 100%
rename from barbican/values_overrides/2023.2-ubuntu_jammy.yaml
rename to values_overrides/barbican/2023.2-ubuntu_jammy.yaml
diff --git a/barbican/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/barbican/2024.1-ubuntu_jammy.yaml
similarity index 100%
rename from barbican/values_overrides/2024.1-ubuntu_jammy.yaml
rename to values_overrides/barbican/2024.1-ubuntu_jammy.yaml
diff --git a/barbican/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/barbican/2024.2-ubuntu_jammy.yaml
similarity index 100%
rename from barbican/values_overrides/2024.2-ubuntu_jammy.yaml
rename to values_overrides/barbican/2024.2-ubuntu_jammy.yaml
diff --git a/barbican/values_overrides/annotations.yaml b/values_overrides/barbican/annotations.yaml
similarity index 100%
rename from barbican/values_overrides/annotations.yaml
rename to values_overrides/barbican/annotations.yaml
diff --git a/barbican/values_overrides/apparmor.yaml b/values_overrides/barbican/apparmor.yaml
similarity index 100%
rename from barbican/values_overrides/apparmor.yaml
rename to values_overrides/barbican/apparmor.yaml
diff --git a/barbican/values_overrides/netpol.yaml b/values_overrides/barbican/netpol.yaml
similarity index 100%
rename from barbican/values_overrides/netpol.yaml
rename to values_overrides/barbican/netpol.yaml
diff --git a/barbican/values_overrides/tls-offloading.yaml b/values_overrides/barbican/tls-offloading.yaml
similarity index 100%
rename from barbican/values_overrides/tls-offloading.yaml
rename to values_overrides/barbican/tls-offloading.yaml
diff --git a/barbican/values_overrides/tls.yaml b/values_overrides/barbican/tls.yaml
similarity index 100%
rename from barbican/values_overrides/tls.yaml
rename to values_overrides/barbican/tls.yaml
diff --git a/barbican/values_overrides/victoria-ubuntu_focal.yaml b/values_overrides/barbican/victoria-ubuntu_focal.yaml
similarity index 100%
rename from barbican/values_overrides/victoria-ubuntu_focal.yaml
rename to values_overrides/barbican/victoria-ubuntu_focal.yaml
diff --git a/barbican/values_overrides/wallaby-ubuntu_focal.yaml b/values_overrides/barbican/wallaby-ubuntu_focal.yaml
similarity index 100%
rename from barbican/values_overrides/wallaby-ubuntu_focal.yaml
rename to values_overrides/barbican/wallaby-ubuntu_focal.yaml
diff --git a/barbican/values_overrides/xena-ubuntu_focal.yaml b/values_overrides/barbican/xena-ubuntu_focal.yaml
similarity index 100%
rename from barbican/values_overrides/xena-ubuntu_focal.yaml
rename to values_overrides/barbican/xena-ubuntu_focal.yaml
diff --git a/barbican/values_overrides/yoga-ubuntu_focal.yaml b/values_overrides/barbican/yoga-ubuntu_focal.yaml
similarity index 100%
rename from barbican/values_overrides/yoga-ubuntu_focal.yaml
rename to values_overrides/barbican/yoga-ubuntu_focal.yaml
diff --git a/barbican/values_overrides/zed-ubuntu_focal.yaml b/values_overrides/barbican/zed-ubuntu_focal.yaml
similarity index 100%
rename from barbican/values_overrides/zed-ubuntu_focal.yaml
rename to values_overrides/barbican/zed-ubuntu_focal.yaml
diff --git a/barbican/values_overrides/zed-ubuntu_jammy.yaml b/values_overrides/barbican/zed-ubuntu_jammy.yaml
similarity index 100%
rename from barbican/values_overrides/zed-ubuntu_jammy.yaml
rename to values_overrides/barbican/zed-ubuntu_jammy.yaml
diff --git a/ceilometer/values_overrides/annotations.yaml b/values_overrides/ceilometer/annotations.yaml
similarity index 100%
rename from ceilometer/values_overrides/annotations.yaml
rename to values_overrides/ceilometer/annotations.yaml
diff --git a/cinder/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/cinder/2023.1-ubuntu_focal.yaml
similarity index 100%
rename from cinder/values_overrides/2023.1-ubuntu_focal.yaml
rename to values_overrides/cinder/2023.1-ubuntu_focal.yaml
diff --git a/cinder/values_overrides/2023.1-ubuntu_jammy.yaml b/values_overrides/cinder/2023.1-ubuntu_jammy.yaml
similarity index 100%
rename from cinder/values_overrides/2023.1-ubuntu_jammy.yaml
rename to values_overrides/cinder/2023.1-ubuntu_jammy.yaml
diff --git a/cinder/values_overrides/2023.2-ubuntu_jammy.yaml b/values_overrides/cinder/2023.2-ubuntu_jammy.yaml
similarity index 100%
rename from cinder/values_overrides/2023.2-ubuntu_jammy.yaml
rename to values_overrides/cinder/2023.2-ubuntu_jammy.yaml
diff --git a/cinder/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/cinder/2024.1-ubuntu_jammy.yaml
similarity index 100%
rename from cinder/values_overrides/2024.1-ubuntu_jammy.yaml
rename to values_overrides/cinder/2024.1-ubuntu_jammy.yaml
diff --git a/cinder/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/cinder/2024.2-ubuntu_jammy.yaml
similarity index 100%
rename from cinder/values_overrides/2024.2-ubuntu_jammy.yaml
rename to values_overrides/cinder/2024.2-ubuntu_jammy.yaml
diff --git a/cinder/values_overrides/annotations.yaml b/values_overrides/cinder/annotations.yaml
similarity index 100%
rename from cinder/values_overrides/annotations.yaml
rename to values_overrides/cinder/annotations.yaml
diff --git a/cinder/values_overrides/apparmor.yaml b/values_overrides/cinder/apparmor.yaml
similarity index 100%
rename from cinder/values_overrides/apparmor.yaml
rename to values_overrides/cinder/apparmor.yaml
diff --git a/cinder/values_overrides/backend_pure.yaml b/values_overrides/cinder/backend_pure.yaml
similarity index 100%
rename from cinder/values_overrides/backend_pure.yaml
rename to values_overrides/cinder/backend_pure.yaml
diff --git a/cinder/values_overrides/external-ceph-backend.yaml b/values_overrides/cinder/external-ceph-backend.yaml
similarity index 100%
rename from cinder/values_overrides/external-ceph-backend.yaml
rename to values_overrides/cinder/external-ceph-backend.yaml
diff --git a/cinder/values_overrides/external-ceph-configmap.yaml b/values_overrides/cinder/external-ceph-configmap.yaml
similarity index 100%
rename from cinder/values_overrides/external-ceph-configmap.yaml
rename to values_overrides/cinder/external-ceph-configmap.yaml
diff --git a/cinder/values_overrides/netpol.yaml b/values_overrides/cinder/netpol.yaml
similarity index 100%
rename from cinder/values_overrides/netpol.yaml
rename to values_overrides/cinder/netpol.yaml
diff --git a/cinder/values_overrides/nfs-cinder-backup.yaml b/values_overrides/cinder/nfs-cinder-backup.yaml
similarity index 100%
rename from cinder/values_overrides/nfs-cinder-backup.yaml
rename to values_overrides/cinder/nfs-cinder-backup.yaml
diff --git a/cinder/values_overrides/qos.yaml b/values_overrides/cinder/qos.yaml
similarity index 100%
rename from cinder/values_overrides/qos.yaml
rename to values_overrides/cinder/qos.yaml
diff --git a/cinder/values_overrides/tls-offloading.yaml b/values_overrides/cinder/tls-offloading.yaml
similarity index 100%
rename from cinder/values_overrides/tls-offloading.yaml
rename to values_overrides/cinder/tls-offloading.yaml
diff --git a/cinder/values_overrides/tls.yaml b/values_overrides/cinder/tls.yaml
similarity index 100%
rename from cinder/values_overrides/tls.yaml
rename to values_overrides/cinder/tls.yaml
diff --git a/cinder/values_overrides/victoria-ubuntu_focal.yaml b/values_overrides/cinder/victoria-ubuntu_focal.yaml
similarity index 100%
rename from cinder/values_overrides/victoria-ubuntu_focal.yaml
rename to values_overrides/cinder/victoria-ubuntu_focal.yaml
diff --git a/cinder/values_overrides/wallaby-ubuntu_focal.yaml b/values_overrides/cinder/wallaby-ubuntu_focal.yaml
similarity index 100%
rename from cinder/values_overrides/wallaby-ubuntu_focal.yaml
rename to values_overrides/cinder/wallaby-ubuntu_focal.yaml
diff --git a/cinder/values_overrides/xena-ubuntu_focal.yaml b/values_overrides/cinder/xena-ubuntu_focal.yaml
similarity index 100%
rename from cinder/values_overrides/xena-ubuntu_focal.yaml
rename to values_overrides/cinder/xena-ubuntu_focal.yaml
diff --git a/cinder/values_overrides/yoga-ubuntu_focal.yaml b/values_overrides/cinder/yoga-ubuntu_focal.yaml
similarity index 100%
rename from cinder/values_overrides/yoga-ubuntu_focal.yaml
rename to values_overrides/cinder/yoga-ubuntu_focal.yaml
diff --git a/cinder/values_overrides/zed-ubuntu_focal.yaml b/values_overrides/cinder/zed-ubuntu_focal.yaml
similarity index 100%
rename from cinder/values_overrides/zed-ubuntu_focal.yaml
rename to values_overrides/cinder/zed-ubuntu_focal.yaml
diff --git a/cinder/values_overrides/zed-ubuntu_jammy.yaml b/values_overrides/cinder/zed-ubuntu_jammy.yaml
similarity index 100%
rename from cinder/values_overrides/zed-ubuntu_jammy.yaml
rename to values_overrides/cinder/zed-ubuntu_jammy.yaml
diff --git a/cyborg/values_overrides/annotations.yaml b/values_overrides/cyborg/annotations.yaml
similarity index 100%
rename from cyborg/values_overrides/annotations.yaml
rename to values_overrides/cyborg/annotations.yaml
diff --git a/designate/values_overrides/annotations.yaml b/values_overrides/designate/annotations.yaml
similarity index 100%
rename from designate/values_overrides/annotations.yaml
rename to values_overrides/designate/annotations.yaml
diff --git a/glance/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/glance/2023.1-ubuntu_focal.yaml
similarity index 100%
rename from glance/values_overrides/2023.1-ubuntu_focal.yaml
rename to values_overrides/glance/2023.1-ubuntu_focal.yaml
diff --git a/glance/values_overrides/2023.1-ubuntu_jammy.yaml b/values_overrides/glance/2023.1-ubuntu_jammy.yaml
similarity index 100%
rename from glance/values_overrides/2023.1-ubuntu_jammy.yaml
rename to values_overrides/glance/2023.1-ubuntu_jammy.yaml
diff --git a/glance/values_overrides/2023.2-ubuntu_jammy.yaml b/values_overrides/glance/2023.2-ubuntu_jammy.yaml
similarity index 100%
rename from glance/values_overrides/2023.2-ubuntu_jammy.yaml
rename to values_overrides/glance/2023.2-ubuntu_jammy.yaml
diff --git a/glance/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/glance/2024.1-ubuntu_jammy.yaml
similarity index 100%
rename from glance/values_overrides/2024.1-ubuntu_jammy.yaml
rename to values_overrides/glance/2024.1-ubuntu_jammy.yaml
diff --git a/glance/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/glance/2024.2-ubuntu_jammy.yaml
similarity index 100%
rename from glance/values_overrides/2024.2-ubuntu_jammy.yaml
rename to values_overrides/glance/2024.2-ubuntu_jammy.yaml
diff --git a/glance/values_overrides/annotations.yaml b/values_overrides/glance/annotations.yaml
similarity index 100%
rename from glance/values_overrides/annotations.yaml
rename to values_overrides/glance/annotations.yaml
diff --git a/glance/values_overrides/apparmor.yaml b/values_overrides/glance/apparmor.yaml
similarity index 100%
rename from glance/values_overrides/apparmor.yaml
rename to values_overrides/glance/apparmor.yaml
diff --git a/glance/values_overrides/bootstrap-ubuntu-image.yaml b/values_overrides/glance/bootstrap-ubuntu-image.yaml
similarity index 100%
rename from glance/values_overrides/bootstrap-ubuntu-image.yaml
rename to values_overrides/glance/bootstrap-ubuntu-image.yaml
diff --git a/glance/values_overrides/netpol.yaml b/values_overrides/glance/netpol.yaml
similarity index 100%
rename from glance/values_overrides/netpol.yaml
rename to values_overrides/glance/netpol.yaml
diff --git a/glance/values_overrides/tls-offloading.yaml b/values_overrides/glance/tls-offloading.yaml
similarity index 100%
rename from glance/values_overrides/tls-offloading.yaml
rename to values_overrides/glance/tls-offloading.yaml
diff --git a/glance/values_overrides/tls.yaml b/values_overrides/glance/tls.yaml
similarity index 100%
rename from glance/values_overrides/tls.yaml
rename to values_overrides/glance/tls.yaml
diff --git a/glance/values_overrides/victoria-ubuntu_focal.yaml b/values_overrides/glance/victoria-ubuntu_focal.yaml
similarity index 100%
rename from glance/values_overrides/victoria-ubuntu_focal.yaml
rename to values_overrides/glance/victoria-ubuntu_focal.yaml
diff --git a/glance/values_overrides/wallaby-ubuntu_focal.yaml b/values_overrides/glance/wallaby-ubuntu_focal.yaml
similarity index 100%
rename from glance/values_overrides/wallaby-ubuntu_focal.yaml
rename to values_overrides/glance/wallaby-ubuntu_focal.yaml
diff --git a/glance/values_overrides/xena-ubuntu_focal.yaml b/values_overrides/glance/xena-ubuntu_focal.yaml
similarity index 100%
rename from glance/values_overrides/xena-ubuntu_focal.yaml
rename to values_overrides/glance/xena-ubuntu_focal.yaml
diff --git a/glance/values_overrides/yoga-ubuntu_focal.yaml b/values_overrides/glance/yoga-ubuntu_focal.yaml
similarity index 100%
rename from glance/values_overrides/yoga-ubuntu_focal.yaml
rename to values_overrides/glance/yoga-ubuntu_focal.yaml
diff --git a/glance/values_overrides/zed-ubuntu_focal.yaml b/values_overrides/glance/zed-ubuntu_focal.yaml
similarity index 100%
rename from glance/values_overrides/zed-ubuntu_focal.yaml
rename to values_overrides/glance/zed-ubuntu_focal.yaml
diff --git a/glance/values_overrides/zed-ubuntu_jammy.yaml b/values_overrides/glance/zed-ubuntu_jammy.yaml
similarity index 100%
rename from glance/values_overrides/zed-ubuntu_jammy.yaml
rename to values_overrides/glance/zed-ubuntu_jammy.yaml
diff --git a/heat/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/heat/2023.1-ubuntu_focal.yaml
similarity index 100%
rename from heat/values_overrides/2023.1-ubuntu_focal.yaml
rename to values_overrides/heat/2023.1-ubuntu_focal.yaml
diff --git a/heat/values_overrides/2023.1-ubuntu_jammy.yaml b/values_overrides/heat/2023.1-ubuntu_jammy.yaml
similarity index 100%
rename from heat/values_overrides/2023.1-ubuntu_jammy.yaml
rename to values_overrides/heat/2023.1-ubuntu_jammy.yaml
diff --git a/heat/values_overrides/2023.2-ubuntu_jammy.yaml b/values_overrides/heat/2023.2-ubuntu_jammy.yaml
similarity index 100%
rename from heat/values_overrides/2023.2-ubuntu_jammy.yaml
rename to values_overrides/heat/2023.2-ubuntu_jammy.yaml
diff --git a/heat/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/heat/2024.1-ubuntu_jammy.yaml
similarity index 100%
rename from heat/values_overrides/2024.1-ubuntu_jammy.yaml
rename to values_overrides/heat/2024.1-ubuntu_jammy.yaml
diff --git a/heat/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/heat/2024.2-ubuntu_jammy.yaml
similarity index 100%
rename from heat/values_overrides/2024.2-ubuntu_jammy.yaml
rename to values_overrides/heat/2024.2-ubuntu_jammy.yaml
diff --git a/heat/values_overrides/annotations.yaml b/values_overrides/heat/annotations.yaml
similarity index 100%
rename from heat/values_overrides/annotations.yaml
rename to values_overrides/heat/annotations.yaml
diff --git a/heat/values_overrides/apparmor.yaml b/values_overrides/heat/apparmor.yaml
similarity index 100%
rename from heat/values_overrides/apparmor.yaml
rename to values_overrides/heat/apparmor.yaml
diff --git a/heat/values_overrides/netpol.yaml b/values_overrides/heat/netpol.yaml
similarity index 100%
rename from heat/values_overrides/netpol.yaml
rename to values_overrides/heat/netpol.yaml
diff --git a/heat/values_overrides/tls-offloading.yaml b/values_overrides/heat/tls-offloading.yaml
similarity index 100%
rename from heat/values_overrides/tls-offloading.yaml
rename to values_overrides/heat/tls-offloading.yaml
diff --git a/heat/values_overrides/tls.yaml b/values_overrides/heat/tls.yaml
similarity index 100%
rename from heat/values_overrides/tls.yaml
rename to values_overrides/heat/tls.yaml
diff --git a/heat/values_overrides/victoria-ubuntu_focal.yaml b/values_overrides/heat/victoria-ubuntu_focal.yaml
similarity index 100%
rename from heat/values_overrides/victoria-ubuntu_focal.yaml
rename to values_overrides/heat/victoria-ubuntu_focal.yaml
diff --git a/heat/values_overrides/wallaby-ubuntu_focal.yaml b/values_overrides/heat/wallaby-ubuntu_focal.yaml
similarity index 100%
rename from heat/values_overrides/wallaby-ubuntu_focal.yaml
rename to values_overrides/heat/wallaby-ubuntu_focal.yaml
diff --git a/heat/values_overrides/xena-ubuntu_focal.yaml b/values_overrides/heat/xena-ubuntu_focal.yaml
similarity index 100%
rename from heat/values_overrides/xena-ubuntu_focal.yaml
rename to values_overrides/heat/xena-ubuntu_focal.yaml
diff --git a/heat/values_overrides/yoga-ubuntu_focal.yaml b/values_overrides/heat/yoga-ubuntu_focal.yaml
similarity index 100%
rename from heat/values_overrides/yoga-ubuntu_focal.yaml
rename to values_overrides/heat/yoga-ubuntu_focal.yaml
diff --git a/heat/values_overrides/zed-ubuntu_focal.yaml b/values_overrides/heat/zed-ubuntu_focal.yaml
similarity index 100%
rename from heat/values_overrides/zed-ubuntu_focal.yaml
rename to values_overrides/heat/zed-ubuntu_focal.yaml
diff --git a/heat/values_overrides/zed-ubuntu_jammy.yaml b/values_overrides/heat/zed-ubuntu_jammy.yaml
similarity index 100%
rename from heat/values_overrides/zed-ubuntu_jammy.yaml
rename to values_overrides/heat/zed-ubuntu_jammy.yaml
diff --git a/horizon/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/horizon/2023.1-ubuntu_focal.yaml
similarity index 100%
rename from horizon/values_overrides/2023.1-ubuntu_focal.yaml
rename to values_overrides/horizon/2023.1-ubuntu_focal.yaml
diff --git a/horizon/values_overrides/2023.1-ubuntu_jammy.yaml b/values_overrides/horizon/2023.1-ubuntu_jammy.yaml
similarity index 100%
rename from horizon/values_overrides/2023.1-ubuntu_jammy.yaml
rename to values_overrides/horizon/2023.1-ubuntu_jammy.yaml
diff --git a/horizon/values_overrides/2023.2-ubuntu_jammy.yaml b/values_overrides/horizon/2023.2-ubuntu_jammy.yaml
similarity index 100%
rename from horizon/values_overrides/2023.2-ubuntu_jammy.yaml
rename to values_overrides/horizon/2023.2-ubuntu_jammy.yaml
diff --git a/horizon/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/horizon/2024.1-ubuntu_jammy.yaml
similarity index 100%
rename from horizon/values_overrides/2024.1-ubuntu_jammy.yaml
rename to values_overrides/horizon/2024.1-ubuntu_jammy.yaml
diff --git a/horizon/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/horizon/2024.2-ubuntu_jammy.yaml
similarity index 100%
rename from horizon/values_overrides/2024.2-ubuntu_jammy.yaml
rename to values_overrides/horizon/2024.2-ubuntu_jammy.yaml
diff --git a/horizon/values_overrides/annotations.yaml b/values_overrides/horizon/annotations.yaml
similarity index 100%
rename from horizon/values_overrides/annotations.yaml
rename to values_overrides/horizon/annotations.yaml
diff --git a/horizon/values_overrides/apparmor.yaml b/values_overrides/horizon/apparmor.yaml
similarity index 100%
rename from horizon/values_overrides/apparmor.yaml
rename to values_overrides/horizon/apparmor.yaml
diff --git a/horizon/values_overrides/logo.yaml b/values_overrides/horizon/logo.yaml
similarity index 100%
rename from horizon/values_overrides/logo.yaml
rename to values_overrides/horizon/logo.yaml
diff --git a/horizon/values_overrides/netpol.yaml b/values_overrides/horizon/netpol.yaml
similarity index 100%
rename from horizon/values_overrides/netpol.yaml
rename to values_overrides/horizon/netpol.yaml
diff --git a/horizon/values_overrides/tls.yaml b/values_overrides/horizon/tls.yaml
similarity index 100%
rename from horizon/values_overrides/tls.yaml
rename to values_overrides/horizon/tls.yaml
diff --git a/horizon/values_overrides/victoria-ubuntu_focal.yaml b/values_overrides/horizon/victoria-ubuntu_focal.yaml
similarity index 100%
rename from horizon/values_overrides/victoria-ubuntu_focal.yaml
rename to values_overrides/horizon/victoria-ubuntu_focal.yaml
diff --git a/horizon/values_overrides/wallaby-ubuntu_focal.yaml b/values_overrides/horizon/wallaby-ubuntu_focal.yaml
similarity index 100%
rename from horizon/values_overrides/wallaby-ubuntu_focal.yaml
rename to values_overrides/horizon/wallaby-ubuntu_focal.yaml
diff --git a/horizon/values_overrides/xena-ubuntu_focal.yaml b/values_overrides/horizon/xena-ubuntu_focal.yaml
similarity index 100%
rename from horizon/values_overrides/xena-ubuntu_focal.yaml
rename to values_overrides/horizon/xena-ubuntu_focal.yaml
diff --git a/horizon/values_overrides/yoga-ubuntu_focal.yaml b/values_overrides/horizon/yoga-ubuntu_focal.yaml
similarity index 100%
rename from horizon/values_overrides/yoga-ubuntu_focal.yaml
rename to values_overrides/horizon/yoga-ubuntu_focal.yaml
diff --git a/horizon/values_overrides/zed-ubuntu_focal.yaml b/values_overrides/horizon/zed-ubuntu_focal.yaml
similarity index 100%
rename from horizon/values_overrides/zed-ubuntu_focal.yaml
rename to values_overrides/horizon/zed-ubuntu_focal.yaml
diff --git a/horizon/values_overrides/zed-ubuntu_jammy.yaml b/values_overrides/horizon/zed-ubuntu_jammy.yaml
similarity index 100%
rename from horizon/values_overrides/zed-ubuntu_jammy.yaml
rename to values_overrides/horizon/zed-ubuntu_jammy.yaml
diff --git a/ironic/values_overrides/annotations.yaml b/values_overrides/ironic/annotations.yaml
similarity index 100%
rename from ironic/values_overrides/annotations.yaml
rename to values_overrides/ironic/annotations.yaml
diff --git a/ironic/values_overrides/standalone.yaml b/values_overrides/ironic/standalone.yaml
similarity index 100%
rename from ironic/values_overrides/standalone.yaml
rename to values_overrides/ironic/standalone.yaml
diff --git a/keystone/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/keystone/2023.1-ubuntu_focal.yaml
similarity index 100%
rename from keystone/values_overrides/2023.1-ubuntu_focal.yaml
rename to values_overrides/keystone/2023.1-ubuntu_focal.yaml
diff --git a/keystone/values_overrides/2023.1-ubuntu_jammy.yaml b/values_overrides/keystone/2023.1-ubuntu_jammy.yaml
similarity index 100%
rename from keystone/values_overrides/2023.1-ubuntu_jammy.yaml
rename to values_overrides/keystone/2023.1-ubuntu_jammy.yaml
diff --git a/keystone/values_overrides/2023.2-ubuntu_jammy.yaml b/values_overrides/keystone/2023.2-ubuntu_jammy.yaml
similarity index 100%
rename from keystone/values_overrides/2023.2-ubuntu_jammy.yaml
rename to values_overrides/keystone/2023.2-ubuntu_jammy.yaml
diff --git a/keystone/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/keystone/2024.1-ubuntu_jammy.yaml
similarity index 100%
rename from keystone/values_overrides/2024.1-ubuntu_jammy.yaml
rename to values_overrides/keystone/2024.1-ubuntu_jammy.yaml
diff --git a/keystone/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/keystone/2024.2-ubuntu_jammy.yaml
similarity index 100%
rename from keystone/values_overrides/2024.2-ubuntu_jammy.yaml
rename to values_overrides/keystone/2024.2-ubuntu_jammy.yaml
diff --git a/keystone/values_overrides/annotations.yaml b/values_overrides/keystone/annotations.yaml
similarity index 100%
rename from keystone/values_overrides/annotations.yaml
rename to values_overrides/keystone/annotations.yaml
diff --git a/keystone/values_overrides/apparmor.yaml b/values_overrides/keystone/apparmor.yaml
similarity index 100%
rename from keystone/values_overrides/apparmor.yaml
rename to values_overrides/keystone/apparmor.yaml
diff --git a/keystone/values_overrides/internal-reverse-proxy.yaml b/values_overrides/keystone/internal-reverse-proxy.yaml
similarity index 100%
rename from keystone/values_overrides/internal-reverse-proxy.yaml
rename to values_overrides/keystone/internal-reverse-proxy.yaml
diff --git a/keystone/values_overrides/ldap.yaml b/values_overrides/keystone/ldap.yaml
similarity index 100%
rename from keystone/values_overrides/ldap.yaml
rename to values_overrides/keystone/ldap.yaml
diff --git a/keystone/values_overrides/netpol.yaml b/values_overrides/keystone/netpol.yaml
similarity index 100%
rename from keystone/values_overrides/netpol.yaml
rename to values_overrides/keystone/netpol.yaml
diff --git a/keystone/values_overrides/tls-custom.yaml b/values_overrides/keystone/tls-custom.yaml
similarity index 100%
rename from keystone/values_overrides/tls-custom.yaml
rename to values_overrides/keystone/tls-custom.yaml
diff --git a/keystone/values_overrides/tls.yaml b/values_overrides/keystone/tls.yaml
similarity index 100%
rename from keystone/values_overrides/tls.yaml
rename to values_overrides/keystone/tls.yaml
diff --git a/keystone/values_overrides/victoria-ubuntu_focal.yaml b/values_overrides/keystone/victoria-ubuntu_focal.yaml
similarity index 100%
rename from keystone/values_overrides/victoria-ubuntu_focal.yaml
rename to values_overrides/keystone/victoria-ubuntu_focal.yaml
diff --git a/keystone/values_overrides/wallaby-ubuntu_focal.yaml b/values_overrides/keystone/wallaby-ubuntu_focal.yaml
similarity index 100%
rename from keystone/values_overrides/wallaby-ubuntu_focal.yaml
rename to values_overrides/keystone/wallaby-ubuntu_focal.yaml
diff --git a/keystone/values_overrides/xena-ubuntu_focal.yaml b/values_overrides/keystone/xena-ubuntu_focal.yaml
similarity index 100%
rename from keystone/values_overrides/xena-ubuntu_focal.yaml
rename to values_overrides/keystone/xena-ubuntu_focal.yaml
diff --git a/keystone/values_overrides/yoga-ubuntu_focal.yaml b/values_overrides/keystone/yoga-ubuntu_focal.yaml
similarity index 100%
rename from keystone/values_overrides/yoga-ubuntu_focal.yaml
rename to values_overrides/keystone/yoga-ubuntu_focal.yaml
diff --git a/keystone/values_overrides/zed-ubuntu_focal.yaml b/values_overrides/keystone/zed-ubuntu_focal.yaml
similarity index 100%
rename from keystone/values_overrides/zed-ubuntu_focal.yaml
rename to values_overrides/keystone/zed-ubuntu_focal.yaml
diff --git a/keystone/values_overrides/zed-ubuntu_jammy.yaml b/values_overrides/keystone/zed-ubuntu_jammy.yaml
similarity index 100%
rename from keystone/values_overrides/zed-ubuntu_jammy.yaml
rename to values_overrides/keystone/zed-ubuntu_jammy.yaml
diff --git a/magnum/values_overrides/annotations.yaml b/values_overrides/magnum/annotations.yaml
similarity index 100%
rename from magnum/values_overrides/annotations.yaml
rename to values_overrides/magnum/annotations.yaml
diff --git a/manila/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/manila/2023.1-ubuntu_focal.yaml
similarity index 100%
rename from manila/values_overrides/2023.1-ubuntu_focal.yaml
rename to values_overrides/manila/2023.1-ubuntu_focal.yaml
diff --git a/manila/values_overrides/2023.1-ubuntu_jammy.yaml b/values_overrides/manila/2023.1-ubuntu_jammy.yaml
similarity index 100%
rename from manila/values_overrides/2023.1-ubuntu_jammy.yaml
rename to values_overrides/manila/2023.1-ubuntu_jammy.yaml
diff --git a/manila/values_overrides/2023.2-ubuntu_jammy.yaml b/values_overrides/manila/2023.2-ubuntu_jammy.yaml
similarity index 100%
rename from manila/values_overrides/2023.2-ubuntu_jammy.yaml
rename to values_overrides/manila/2023.2-ubuntu_jammy.yaml
diff --git a/manila/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/manila/2024.1-ubuntu_jammy.yaml
similarity index 100%
rename from manila/values_overrides/2024.1-ubuntu_jammy.yaml
rename to values_overrides/manila/2024.1-ubuntu_jammy.yaml
diff --git a/manila/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/manila/2024.2-ubuntu_jammy.yaml
similarity index 100%
rename from manila/values_overrides/2024.2-ubuntu_jammy.yaml
rename to values_overrides/manila/2024.2-ubuntu_jammy.yaml
diff --git a/manila/values_overrides/annotations.yaml b/values_overrides/manila/annotations.yaml
similarity index 100%
rename from manila/values_overrides/annotations.yaml
rename to values_overrides/manila/annotations.yaml
diff --git a/manila/values_overrides/apparmor.yaml b/values_overrides/manila/apparmor.yaml
similarity index 100%
rename from manila/values_overrides/apparmor.yaml
rename to values_overrides/manila/apparmor.yaml
diff --git a/manila/values_overrides/tls-offloading.yaml b/values_overrides/manila/tls-offloading.yaml
similarity index 100%
rename from manila/values_overrides/tls-offloading.yaml
rename to values_overrides/manila/tls-offloading.yaml
diff --git a/manila/values_overrides/tls.yaml b/values_overrides/manila/tls.yaml
similarity index 100%
rename from manila/values_overrides/tls.yaml
rename to values_overrides/manila/tls.yaml
diff --git a/manila/values_overrides/xena-ubuntu_focal.yaml b/values_overrides/manila/xena-ubuntu_focal.yaml
similarity index 100%
rename from manila/values_overrides/xena-ubuntu_focal.yaml
rename to values_overrides/manila/xena-ubuntu_focal.yaml
diff --git a/manila/values_overrides/yoga-ubuntu_focal.yaml b/values_overrides/manila/yoga-ubuntu_focal.yaml
similarity index 100%
rename from manila/values_overrides/yoga-ubuntu_focal.yaml
rename to values_overrides/manila/yoga-ubuntu_focal.yaml
diff --git a/manila/values_overrides/zed-ubuntu_focal.yaml b/values_overrides/manila/zed-ubuntu_focal.yaml
similarity index 100%
rename from manila/values_overrides/zed-ubuntu_focal.yaml
rename to values_overrides/manila/zed-ubuntu_focal.yaml
diff --git a/manila/values_overrides/zed-ubuntu_jammy.yaml b/values_overrides/manila/zed-ubuntu_jammy.yaml
similarity index 100%
rename from manila/values_overrides/zed-ubuntu_jammy.yaml
rename to values_overrides/manila/zed-ubuntu_jammy.yaml
diff --git a/masakari/values_overrides/annotations.yaml b/values_overrides/masakari/annotations.yaml
similarity index 100%
rename from masakari/values_overrides/annotations.yaml
rename to values_overrides/masakari/annotations.yaml
diff --git a/mistral/values_overrides/annotations.yaml b/values_overrides/mistral/annotations.yaml
similarity index 100%
rename from mistral/values_overrides/annotations.yaml
rename to values_overrides/mistral/annotations.yaml
diff --git a/monasca/values_overrides/annotations.yaml b/values_overrides/monasca/annotations.yaml
similarity index 100%
rename from monasca/values_overrides/annotations.yaml
rename to values_overrides/monasca/annotations.yaml
diff --git a/monasca/values_overrides/libvirt.yaml b/values_overrides/monasca/libvirt.yaml
similarity index 100%
rename from monasca/values_overrides/libvirt.yaml
rename to values_overrides/monasca/libvirt.yaml
diff --git a/monasca/values_overrides/nvidia.yaml b/values_overrides/monasca/nvidia.yaml
similarity index 100%
rename from monasca/values_overrides/nvidia.yaml
rename to values_overrides/monasca/nvidia.yaml
diff --git a/neutron/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/neutron/2023.1-ubuntu_focal.yaml
similarity index 100%
rename from neutron/values_overrides/2023.1-ubuntu_focal.yaml
rename to values_overrides/neutron/2023.1-ubuntu_focal.yaml
diff --git a/neutron/values_overrides/2023.1-ubuntu_jammy.yaml b/values_overrides/neutron/2023.1-ubuntu_jammy.yaml
similarity index 100%
rename from neutron/values_overrides/2023.1-ubuntu_jammy.yaml
rename to values_overrides/neutron/2023.1-ubuntu_jammy.yaml
diff --git a/neutron/values_overrides/2023.2-ubuntu_jammy.yaml b/values_overrides/neutron/2023.2-ubuntu_jammy.yaml
similarity index 100%
rename from neutron/values_overrides/2023.2-ubuntu_jammy.yaml
rename to values_overrides/neutron/2023.2-ubuntu_jammy.yaml
diff --git a/neutron/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/neutron/2024.1-ubuntu_jammy.yaml
similarity index 100%
rename from neutron/values_overrides/2024.1-ubuntu_jammy.yaml
rename to values_overrides/neutron/2024.1-ubuntu_jammy.yaml
diff --git a/neutron/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/neutron/2024.2-ubuntu_jammy.yaml
similarity index 100%
rename from neutron/values_overrides/2024.2-ubuntu_jammy.yaml
rename to values_overrides/neutron/2024.2-ubuntu_jammy.yaml
diff --git a/neutron/values_overrides/annotations.yaml b/values_overrides/neutron/annotations.yaml
similarity index 100%
rename from neutron/values_overrides/annotations.yaml
rename to values_overrides/neutron/annotations.yaml
diff --git a/neutron/values_overrides/apparmor.yaml b/values_overrides/neutron/apparmor.yaml
similarity index 100%
rename from neutron/values_overrides/apparmor.yaml
rename to values_overrides/neutron/apparmor.yaml
diff --git a/neutron/values_overrides/bagpipe_bgp.yaml b/values_overrides/neutron/bagpipe_bgp.yaml
similarity index 100%
rename from neutron/values_overrides/bagpipe_bgp.yaml
rename to values_overrides/neutron/bagpipe_bgp.yaml
diff --git a/neutron/values_overrides/dpdk-bond.yaml b/values_overrides/neutron/dpdk-bond.yaml
similarity index 100%
rename from neutron/values_overrides/dpdk-bond.yaml
rename to values_overrides/neutron/dpdk-bond.yaml
diff --git a/neutron/values_overrides/dpdk.yaml b/values_overrides/neutron/dpdk.yaml
similarity index 100%
rename from neutron/values_overrides/dpdk.yaml
rename to values_overrides/neutron/dpdk.yaml
diff --git a/neutron/values_overrides/gate.yaml b/values_overrides/neutron/gate.yaml
similarity index 100%
rename from neutron/values_overrides/gate.yaml
rename to values_overrides/neutron/gate.yaml
diff --git a/neutron/values_overrides/l2gateway.yaml b/values_overrides/neutron/l2gateway.yaml
similarity index 100%
rename from neutron/values_overrides/l2gateway.yaml
rename to values_overrides/neutron/l2gateway.yaml
diff --git a/neutron/values_overrides/netpol.yaml b/values_overrides/neutron/netpol.yaml
similarity index 100%
rename from neutron/values_overrides/netpol.yaml
rename to values_overrides/neutron/netpol.yaml
diff --git a/neutron/values_overrides/ovn.yaml b/values_overrides/neutron/ovn.yaml
similarity index 100%
rename from neutron/values_overrides/ovn.yaml
rename to values_overrides/neutron/ovn.yaml
diff --git a/neutron/values_overrides/ovn_vpn.yaml b/values_overrides/neutron/ovn_vpn.yaml
similarity index 100%
rename from neutron/values_overrides/ovn_vpn.yaml
rename to values_overrides/neutron/ovn_vpn.yaml
diff --git a/neutron/values_overrides/shared-sriov-ovs-dpdk-bond.yaml b/values_overrides/neutron/shared-sriov-ovs-dpdk-bond.yaml
similarity index 100%
rename from neutron/values_overrides/shared-sriov-ovs-dpdk-bond.yaml
rename to values_overrides/neutron/shared-sriov-ovs-dpdk-bond.yaml
diff --git a/neutron/values_overrides/tf.yaml b/values_overrides/neutron/tf.yaml
similarity index 100%
rename from neutron/values_overrides/tf.yaml
rename to values_overrides/neutron/tf.yaml
diff --git a/neutron/values_overrides/tls-offloading.yaml b/values_overrides/neutron/tls-offloading.yaml
similarity index 100%
rename from neutron/values_overrides/tls-offloading.yaml
rename to values_overrides/neutron/tls-offloading.yaml
diff --git a/neutron/values_overrides/tls.yaml b/values_overrides/neutron/tls.yaml
similarity index 100%
rename from neutron/values_overrides/tls.yaml
rename to values_overrides/neutron/tls.yaml
diff --git a/neutron/values_overrides/victoria-ubuntu_focal.yaml b/values_overrides/neutron/victoria-ubuntu_focal.yaml
similarity index 100%
rename from neutron/values_overrides/victoria-ubuntu_focal.yaml
rename to values_overrides/neutron/victoria-ubuntu_focal.yaml
diff --git a/neutron/values_overrides/wallaby-ubuntu_focal.yaml b/values_overrides/neutron/wallaby-ubuntu_focal.yaml
similarity index 100%
rename from neutron/values_overrides/wallaby-ubuntu_focal.yaml
rename to values_overrides/neutron/wallaby-ubuntu_focal.yaml
diff --git a/neutron/values_overrides/xena-ubuntu_focal.yaml b/values_overrides/neutron/xena-ubuntu_focal.yaml
similarity index 100%
rename from neutron/values_overrides/xena-ubuntu_focal.yaml
rename to values_overrides/neutron/xena-ubuntu_focal.yaml
diff --git a/neutron/values_overrides/yoga-ubuntu_focal.yaml b/values_overrides/neutron/yoga-ubuntu_focal.yaml
similarity index 100%
rename from neutron/values_overrides/yoga-ubuntu_focal.yaml
rename to values_overrides/neutron/yoga-ubuntu_focal.yaml
diff --git a/neutron/values_overrides/zed-ubuntu_focal.yaml b/values_overrides/neutron/zed-ubuntu_focal.yaml
similarity index 100%
rename from neutron/values_overrides/zed-ubuntu_focal.yaml
rename to values_overrides/neutron/zed-ubuntu_focal.yaml
diff --git a/neutron/values_overrides/zed-ubuntu_jammy.yaml b/values_overrides/neutron/zed-ubuntu_jammy.yaml
similarity index 100%
rename from neutron/values_overrides/zed-ubuntu_jammy.yaml
rename to values_overrides/neutron/zed-ubuntu_jammy.yaml
diff --git a/nova/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/nova/2023.1-ubuntu_focal.yaml
similarity index 100%
rename from nova/values_overrides/2023.1-ubuntu_focal.yaml
rename to values_overrides/nova/2023.1-ubuntu_focal.yaml
diff --git a/nova/values_overrides/2023.1-ubuntu_jammy.yaml b/values_overrides/nova/2023.1-ubuntu_jammy.yaml
similarity index 100%
rename from nova/values_overrides/2023.1-ubuntu_jammy.yaml
rename to values_overrides/nova/2023.1-ubuntu_jammy.yaml
diff --git a/nova/values_overrides/2023.2-ubuntu_jammy.yaml b/values_overrides/nova/2023.2-ubuntu_jammy.yaml
similarity index 100%
rename from nova/values_overrides/2023.2-ubuntu_jammy.yaml
rename to values_overrides/nova/2023.2-ubuntu_jammy.yaml
diff --git a/nova/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/nova/2024.1-ubuntu_jammy.yaml
similarity index 100%
rename from nova/values_overrides/2024.1-ubuntu_jammy.yaml
rename to values_overrides/nova/2024.1-ubuntu_jammy.yaml
diff --git a/nova/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/nova/2024.2-ubuntu_jammy.yaml
similarity index 100%
rename from nova/values_overrides/2024.2-ubuntu_jammy.yaml
rename to values_overrides/nova/2024.2-ubuntu_jammy.yaml
diff --git a/nova/values_overrides/annotations.yaml b/values_overrides/nova/annotations.yaml
similarity index 100%
rename from nova/values_overrides/annotations.yaml
rename to values_overrides/nova/annotations.yaml
diff --git a/nova/values_overrides/apparmor.yaml b/values_overrides/nova/apparmor.yaml
similarity index 100%
rename from nova/values_overrides/apparmor.yaml
rename to values_overrides/nova/apparmor.yaml
diff --git a/nova/values_overrides/cntt.yaml b/values_overrides/nova/cntt.yaml
similarity index 100%
rename from nova/values_overrides/cntt.yaml
rename to values_overrides/nova/cntt.yaml
diff --git a/nova/values_overrides/dpdk.yaml b/values_overrides/nova/dpdk.yaml
similarity index 100%
rename from nova/values_overrides/dpdk.yaml
rename to values_overrides/nova/dpdk.yaml
diff --git a/nova/values_overrides/netpol.yaml b/values_overrides/nova/netpol.yaml
similarity index 100%
rename from nova/values_overrides/netpol.yaml
rename to values_overrides/nova/netpol.yaml
diff --git a/nova/values_overrides/opensuse_15.yaml b/values_overrides/nova/opensuse_15.yaml
similarity index 100%
rename from nova/values_overrides/opensuse_15.yaml
rename to values_overrides/nova/opensuse_15.yaml
diff --git a/nova/values_overrides/ovn.yaml b/values_overrides/nova/ovn.yaml
similarity index 100%
rename from nova/values_overrides/ovn.yaml
rename to values_overrides/nova/ovn.yaml
diff --git a/nova/values_overrides/ssh.yaml b/values_overrides/nova/ssh.yaml
similarity index 100%
rename from nova/values_overrides/ssh.yaml
rename to values_overrides/nova/ssh.yaml
diff --git a/nova/values_overrides/tf.yaml b/values_overrides/nova/tf.yaml
similarity index 100%
rename from nova/values_overrides/tf.yaml
rename to values_overrides/nova/tf.yaml
diff --git a/nova/values_overrides/tls-offloading.yaml b/values_overrides/nova/tls-offloading.yaml
similarity index 100%
rename from nova/values_overrides/tls-offloading.yaml
rename to values_overrides/nova/tls-offloading.yaml
diff --git a/nova/values_overrides/tls.yaml b/values_overrides/nova/tls.yaml
similarity index 100%
rename from nova/values_overrides/tls.yaml
rename to values_overrides/nova/tls.yaml
diff --git a/nova/values_overrides/victoria-ubuntu_focal.yaml b/values_overrides/nova/victoria-ubuntu_focal.yaml
similarity index 100%
rename from nova/values_overrides/victoria-ubuntu_focal.yaml
rename to values_overrides/nova/victoria-ubuntu_focal.yaml
diff --git a/nova/values_overrides/wallaby-ubuntu_focal.yaml b/values_overrides/nova/wallaby-ubuntu_focal.yaml
similarity index 100%
rename from nova/values_overrides/wallaby-ubuntu_focal.yaml
rename to values_overrides/nova/wallaby-ubuntu_focal.yaml
diff --git a/nova/values_overrides/xena-ubuntu_focal.yaml b/values_overrides/nova/xena-ubuntu_focal.yaml
similarity index 100%
rename from nova/values_overrides/xena-ubuntu_focal.yaml
rename to values_overrides/nova/xena-ubuntu_focal.yaml
diff --git a/nova/values_overrides/yoga-ubuntu_focal.yaml b/values_overrides/nova/yoga-ubuntu_focal.yaml
similarity index 100%
rename from nova/values_overrides/yoga-ubuntu_focal.yaml
rename to values_overrides/nova/yoga-ubuntu_focal.yaml
diff --git a/nova/values_overrides/zed-ubuntu_focal.yaml b/values_overrides/nova/zed-ubuntu_focal.yaml
similarity index 100%
rename from nova/values_overrides/zed-ubuntu_focal.yaml
rename to values_overrides/nova/zed-ubuntu_focal.yaml
diff --git a/nova/values_overrides/zed-ubuntu_jammy.yaml b/values_overrides/nova/zed-ubuntu_jammy.yaml
similarity index 100%
rename from nova/values_overrides/zed-ubuntu_jammy.yaml
rename to values_overrides/nova/zed-ubuntu_jammy.yaml
diff --git a/octavia/values_overrides/annotations.yaml b/values_overrides/octavia/annotations.yaml
similarity index 100%
rename from octavia/values_overrides/annotations.yaml
rename to values_overrides/octavia/annotations.yaml
diff --git a/openstack/values_overrides/glance/2023.1-ubuntu_focal.yaml b/values_overrides/openstack/glance/2023.1-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/glance/2023.1-ubuntu_focal.yaml
rename to values_overrides/openstack/glance/2023.1-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/glance/2023.1-ubuntu_jammy.yaml b/values_overrides/openstack/glance/2023.1-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/glance/2023.1-ubuntu_jammy.yaml
rename to values_overrides/openstack/glance/2023.1-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/glance/2023.2-ubuntu_jammy.yaml b/values_overrides/openstack/glance/2023.2-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/glance/2023.2-ubuntu_jammy.yaml
rename to values_overrides/openstack/glance/2023.2-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/glance/2024.1-ubuntu_jammy.yaml b/values_overrides/openstack/glance/2024.1-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/glance/2024.1-ubuntu_jammy.yaml
rename to values_overrides/openstack/glance/2024.1-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/glance/2024.2-ubuntu_jammy.yaml b/values_overrides/openstack/glance/2024.2-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/glance/2024.2-ubuntu_jammy.yaml
rename to values_overrides/openstack/glance/2024.2-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/glance/apparmor.yaml b/values_overrides/openstack/glance/apparmor.yaml
similarity index 100%
rename from openstack/values_overrides/glance/apparmor.yaml
rename to values_overrides/openstack/glance/apparmor.yaml
diff --git a/openstack/values_overrides/glance/netpol.yaml b/values_overrides/openstack/glance/netpol.yaml
similarity index 100%
rename from openstack/values_overrides/glance/netpol.yaml
rename to values_overrides/openstack/glance/netpol.yaml
diff --git a/openstack/values_overrides/glance/tls.yaml b/values_overrides/openstack/glance/tls.yaml
similarity index 100%
rename from openstack/values_overrides/glance/tls.yaml
rename to values_overrides/openstack/glance/tls.yaml
diff --git a/openstack/values_overrides/glance/victoria-ubuntu_focal.yaml b/values_overrides/openstack/glance/victoria-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/glance/victoria-ubuntu_focal.yaml
rename to values_overrides/openstack/glance/victoria-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/glance/wallaby-ubuntu_focal.yaml b/values_overrides/openstack/glance/wallaby-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/glance/wallaby-ubuntu_focal.yaml
rename to values_overrides/openstack/glance/wallaby-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/glance/zed-ubuntu_focal.yaml b/values_overrides/openstack/glance/zed-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/glance/zed-ubuntu_focal.yaml
rename to values_overrides/openstack/glance/zed-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/glance/zed-ubuntu_jammy.yaml b/values_overrides/openstack/glance/zed-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/glance/zed-ubuntu_jammy.yaml
rename to values_overrides/openstack/glance/zed-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/heat/2023.1-ubuntu_focal.yaml b/values_overrides/openstack/heat/2023.1-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/heat/2023.1-ubuntu_focal.yaml
rename to values_overrides/openstack/heat/2023.1-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/heat/2023.1-ubuntu_jammy.yaml b/values_overrides/openstack/heat/2023.1-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/heat/2023.1-ubuntu_jammy.yaml
rename to values_overrides/openstack/heat/2023.1-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/heat/2023.2-ubuntu_jammy.yaml b/values_overrides/openstack/heat/2023.2-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/heat/2023.2-ubuntu_jammy.yaml
rename to values_overrides/openstack/heat/2023.2-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/heat/2024.1-ubuntu_jammy.yaml b/values_overrides/openstack/heat/2024.1-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/heat/2024.1-ubuntu_jammy.yaml
rename to values_overrides/openstack/heat/2024.1-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/heat/2024.2-ubuntu_jammy.yaml b/values_overrides/openstack/heat/2024.2-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/heat/2024.2-ubuntu_jammy.yaml
rename to values_overrides/openstack/heat/2024.2-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/heat/apparmor.yaml b/values_overrides/openstack/heat/apparmor.yaml
similarity index 100%
rename from openstack/values_overrides/heat/apparmor.yaml
rename to values_overrides/openstack/heat/apparmor.yaml
diff --git a/openstack/values_overrides/heat/netpol.yaml b/values_overrides/openstack/heat/netpol.yaml
similarity index 100%
rename from openstack/values_overrides/heat/netpol.yaml
rename to values_overrides/openstack/heat/netpol.yaml
diff --git a/openstack/values_overrides/heat/tls.yaml b/values_overrides/openstack/heat/tls.yaml
similarity index 100%
rename from openstack/values_overrides/heat/tls.yaml
rename to values_overrides/openstack/heat/tls.yaml
diff --git a/openstack/values_overrides/heat/victoria-ubuntu_focal.yaml b/values_overrides/openstack/heat/victoria-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/heat/victoria-ubuntu_focal.yaml
rename to values_overrides/openstack/heat/victoria-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/heat/wallaby-ubuntu_focal.yaml b/values_overrides/openstack/heat/wallaby-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/heat/wallaby-ubuntu_focal.yaml
rename to values_overrides/openstack/heat/wallaby-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/heat/zed-ubuntu_focal.yaml b/values_overrides/openstack/heat/zed-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/heat/zed-ubuntu_focal.yaml
rename to values_overrides/openstack/heat/zed-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/heat/zed-ubuntu_jammy.yaml b/values_overrides/openstack/heat/zed-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/heat/zed-ubuntu_jammy.yaml
rename to values_overrides/openstack/heat/zed-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/horizon/2023.1-ubuntu_focal.yaml b/values_overrides/openstack/horizon/2023.1-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/horizon/2023.1-ubuntu_focal.yaml
rename to values_overrides/openstack/horizon/2023.1-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/horizon/2023.1-ubuntu_jammy.yaml b/values_overrides/openstack/horizon/2023.1-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/horizon/2023.1-ubuntu_jammy.yaml
rename to values_overrides/openstack/horizon/2023.1-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/horizon/2023.2-ubuntu_jammy.yaml b/values_overrides/openstack/horizon/2023.2-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/horizon/2023.2-ubuntu_jammy.yaml
rename to values_overrides/openstack/horizon/2023.2-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/horizon/2024.1-ubuntu_jammy.yaml b/values_overrides/openstack/horizon/2024.1-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/horizon/2024.1-ubuntu_jammy.yaml
rename to values_overrides/openstack/horizon/2024.1-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/horizon/2024.2-ubuntu_jammy.yaml b/values_overrides/openstack/horizon/2024.2-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/horizon/2024.2-ubuntu_jammy.yaml
rename to values_overrides/openstack/horizon/2024.2-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/horizon/apparmor.yaml b/values_overrides/openstack/horizon/apparmor.yaml
similarity index 100%
rename from openstack/values_overrides/horizon/apparmor.yaml
rename to values_overrides/openstack/horizon/apparmor.yaml
diff --git a/openstack/values_overrides/horizon/netpol.yaml b/values_overrides/openstack/horizon/netpol.yaml
similarity index 100%
rename from openstack/values_overrides/horizon/netpol.yaml
rename to values_overrides/openstack/horizon/netpol.yaml
diff --git a/openstack/values_overrides/horizon/tls.yaml b/values_overrides/openstack/horizon/tls.yaml
similarity index 100%
rename from openstack/values_overrides/horizon/tls.yaml
rename to values_overrides/openstack/horizon/tls.yaml
diff --git a/openstack/values_overrides/horizon/victoria-ubuntu_focal.yaml b/values_overrides/openstack/horizon/victoria-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/horizon/victoria-ubuntu_focal.yaml
rename to values_overrides/openstack/horizon/victoria-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/horizon/wallaby-ubuntu_focal.yaml b/values_overrides/openstack/horizon/wallaby-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/horizon/wallaby-ubuntu_focal.yaml
rename to values_overrides/openstack/horizon/wallaby-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/horizon/xena-ubuntu_focal.yaml b/values_overrides/openstack/horizon/xena-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/horizon/xena-ubuntu_focal.yaml
rename to values_overrides/openstack/horizon/xena-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/horizon/yoga-ubuntu_focal.yaml b/values_overrides/openstack/horizon/yoga-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/horizon/yoga-ubuntu_focal.yaml
rename to values_overrides/openstack/horizon/yoga-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/horizon/zed-ubuntu_focal.yaml b/values_overrides/openstack/horizon/zed-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/horizon/zed-ubuntu_focal.yaml
rename to values_overrides/openstack/horizon/zed-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/horizon/zed-ubuntu_jammy.yaml b/values_overrides/openstack/horizon/zed-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/horizon/zed-ubuntu_jammy.yaml
rename to values_overrides/openstack/horizon/zed-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/keystone/2023.1-ubuntu_focal.yaml b/values_overrides/openstack/keystone/2023.1-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/keystone/2023.1-ubuntu_focal.yaml
rename to values_overrides/openstack/keystone/2023.1-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/keystone/2023.1-ubuntu_jammy.yaml b/values_overrides/openstack/keystone/2023.1-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/keystone/2023.1-ubuntu_jammy.yaml
rename to values_overrides/openstack/keystone/2023.1-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/keystone/2023.2-ubuntu_jammy.yaml b/values_overrides/openstack/keystone/2023.2-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/keystone/2023.2-ubuntu_jammy.yaml
rename to values_overrides/openstack/keystone/2023.2-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/keystone/2024.1-ubuntu_jammy.yaml b/values_overrides/openstack/keystone/2024.1-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/keystone/2024.1-ubuntu_jammy.yaml
rename to values_overrides/openstack/keystone/2024.1-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/keystone/2024.2-ubuntu_jammy.yaml b/values_overrides/openstack/keystone/2024.2-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/keystone/2024.2-ubuntu_jammy.yaml
rename to values_overrides/openstack/keystone/2024.2-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/keystone/apparmor.yaml b/values_overrides/openstack/keystone/apparmor.yaml
similarity index 100%
rename from openstack/values_overrides/keystone/apparmor.yaml
rename to values_overrides/openstack/keystone/apparmor.yaml
diff --git a/openstack/values_overrides/keystone/ldap.yaml b/values_overrides/openstack/keystone/ldap.yaml
similarity index 100%
rename from openstack/values_overrides/keystone/ldap.yaml
rename to values_overrides/openstack/keystone/ldap.yaml
diff --git a/openstack/values_overrides/keystone/netpol.yaml b/values_overrides/openstack/keystone/netpol.yaml
similarity index 100%
rename from openstack/values_overrides/keystone/netpol.yaml
rename to values_overrides/openstack/keystone/netpol.yaml
diff --git a/openstack/values_overrides/keystone/tls.yaml b/values_overrides/openstack/keystone/tls.yaml
similarity index 100%
rename from openstack/values_overrides/keystone/tls.yaml
rename to values_overrides/openstack/keystone/tls.yaml
diff --git a/openstack/values_overrides/keystone/victoria-ubuntu_focal.yaml b/values_overrides/openstack/keystone/victoria-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/keystone/victoria-ubuntu_focal.yaml
rename to values_overrides/openstack/keystone/victoria-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/keystone/wallaby-ubuntu_focal.yaml b/values_overrides/openstack/keystone/wallaby-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/keystone/wallaby-ubuntu_focal.yaml
rename to values_overrides/openstack/keystone/wallaby-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/keystone/zed-ubuntu_focal.yaml b/values_overrides/openstack/keystone/zed-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/keystone/zed-ubuntu_focal.yaml
rename to values_overrides/openstack/keystone/zed-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/keystone/zed-ubuntu_jammy.yaml b/values_overrides/openstack/keystone/zed-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/keystone/zed-ubuntu_jammy.yaml
rename to values_overrides/openstack/keystone/zed-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/libvirt/2023.1-ubuntu_focal.yaml b/values_overrides/openstack/libvirt/2023.1-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/libvirt/2023.1-ubuntu_focal.yaml
rename to values_overrides/openstack/libvirt/2023.1-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/libvirt/2023.1-ubuntu_jammy.yaml b/values_overrides/openstack/libvirt/2023.1-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/libvirt/2023.1-ubuntu_jammy.yaml
rename to values_overrides/openstack/libvirt/2023.1-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/libvirt/2023.2-ubuntu_jammy.yaml b/values_overrides/openstack/libvirt/2023.2-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/libvirt/2023.2-ubuntu_jammy.yaml
rename to values_overrides/openstack/libvirt/2023.2-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/libvirt/2024.1-ubuntu_jammy.yaml b/values_overrides/openstack/libvirt/2024.1-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/libvirt/2024.1-ubuntu_jammy.yaml
rename to values_overrides/openstack/libvirt/2024.1-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/libvirt/2024.2-ubuntu_jammy.yaml b/values_overrides/openstack/libvirt/2024.2-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/libvirt/2024.2-ubuntu_jammy.yaml
rename to values_overrides/openstack/libvirt/2024.2-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/libvirt/apparmor.yaml b/values_overrides/openstack/libvirt/apparmor.yaml
similarity index 100%
rename from openstack/values_overrides/libvirt/apparmor.yaml
rename to values_overrides/openstack/libvirt/apparmor.yaml
diff --git a/openstack/values_overrides/libvirt/cinder-external-ceph-backend.yaml b/values_overrides/openstack/libvirt/cinder-external-ceph-backend.yaml
similarity index 100%
rename from openstack/values_overrides/libvirt/cinder-external-ceph-backend.yaml
rename to values_overrides/openstack/libvirt/cinder-external-ceph-backend.yaml
diff --git a/openstack/values_overrides/libvirt/netpol.yaml b/values_overrides/openstack/libvirt/netpol.yaml
similarity index 100%
rename from openstack/values_overrides/libvirt/netpol.yaml
rename to values_overrides/openstack/libvirt/netpol.yaml
diff --git a/openstack/values_overrides/libvirt/ssl.yaml b/values_overrides/openstack/libvirt/ssl.yaml
similarity index 100%
rename from openstack/values_overrides/libvirt/ssl.yaml
rename to values_overrides/openstack/libvirt/ssl.yaml
diff --git a/openstack/values_overrides/libvirt/victoria-ubuntu_focal.yaml b/values_overrides/openstack/libvirt/victoria-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/libvirt/victoria-ubuntu_focal.yaml
rename to values_overrides/openstack/libvirt/victoria-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/libvirt/wallaby-ubuntu_focal.yaml b/values_overrides/openstack/libvirt/wallaby-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/libvirt/wallaby-ubuntu_focal.yaml
rename to values_overrides/openstack/libvirt/wallaby-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/libvirt/zed-ubuntu_focal.yaml b/values_overrides/openstack/libvirt/zed-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/libvirt/zed-ubuntu_focal.yaml
rename to values_overrides/openstack/libvirt/zed-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/libvirt/zed-ubuntu_jammy.yaml b/values_overrides/openstack/libvirt/zed-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/libvirt/zed-ubuntu_jammy.yaml
rename to values_overrides/openstack/libvirt/zed-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/mariadb/apparmor.yaml b/values_overrides/openstack/mariadb/apparmor.yaml
similarity index 100%
rename from openstack/values_overrides/mariadb/apparmor.yaml
rename to values_overrides/openstack/mariadb/apparmor.yaml
diff --git a/openstack/values_overrides/mariadb/local-storage.yaml b/values_overrides/openstack/mariadb/local-storage.yaml
similarity index 100%
rename from openstack/values_overrides/mariadb/local-storage.yaml
rename to values_overrides/openstack/mariadb/local-storage.yaml
diff --git a/openstack/values_overrides/mariadb/netpol.yaml b/values_overrides/openstack/mariadb/netpol.yaml
similarity index 100%
rename from openstack/values_overrides/mariadb/netpol.yaml
rename to values_overrides/openstack/mariadb/netpol.yaml
diff --git a/openstack/values_overrides/mariadb/tls.yaml b/values_overrides/openstack/mariadb/tls.yaml
similarity index 100%
rename from openstack/values_overrides/mariadb/tls.yaml
rename to values_overrides/openstack/mariadb/tls.yaml
diff --git a/openstack/values_overrides/memcached/apparmor.yaml b/values_overrides/openstack/memcached/apparmor.yaml
similarity index 100%
rename from openstack/values_overrides/memcached/apparmor.yaml
rename to values_overrides/openstack/memcached/apparmor.yaml
diff --git a/openstack/values_overrides/memcached/netpol.yaml b/values_overrides/openstack/memcached/netpol.yaml
similarity index 100%
rename from openstack/values_overrides/memcached/netpol.yaml
rename to values_overrides/openstack/memcached/netpol.yaml
diff --git a/openstack/values_overrides/neutron/2023.1-ubuntu_focal.yaml b/values_overrides/openstack/neutron/2023.1-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/neutron/2023.1-ubuntu_focal.yaml
rename to values_overrides/openstack/neutron/2023.1-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/neutron/2023.1-ubuntu_jammy.yaml b/values_overrides/openstack/neutron/2023.1-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/neutron/2023.1-ubuntu_jammy.yaml
rename to values_overrides/openstack/neutron/2023.1-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/neutron/2023.2-ubuntu_jammy.yaml b/values_overrides/openstack/neutron/2023.2-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/neutron/2023.2-ubuntu_jammy.yaml
rename to values_overrides/openstack/neutron/2023.2-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/neutron/2024.1-ubuntu_jammy.yaml b/values_overrides/openstack/neutron/2024.1-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/neutron/2024.1-ubuntu_jammy.yaml
rename to values_overrides/openstack/neutron/2024.1-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/neutron/2024.2-ubuntu_jammy.yaml b/values_overrides/openstack/neutron/2024.2-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/neutron/2024.2-ubuntu_jammy.yaml
rename to values_overrides/openstack/neutron/2024.2-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/neutron/apparmor.yaml b/values_overrides/openstack/neutron/apparmor.yaml
similarity index 100%
rename from openstack/values_overrides/neutron/apparmor.yaml
rename to values_overrides/openstack/neutron/apparmor.yaml
diff --git a/openstack/values_overrides/neutron/dpdk-bond.yaml b/values_overrides/openstack/neutron/dpdk-bond.yaml
similarity index 100%
rename from openstack/values_overrides/neutron/dpdk-bond.yaml
rename to values_overrides/openstack/neutron/dpdk-bond.yaml
diff --git a/openstack/values_overrides/neutron/dpdk.yaml b/values_overrides/openstack/neutron/dpdk.yaml
similarity index 100%
rename from openstack/values_overrides/neutron/dpdk.yaml
rename to values_overrides/openstack/neutron/dpdk.yaml
diff --git a/openstack/values_overrides/neutron/gate.yaml b/values_overrides/openstack/neutron/gate.yaml
similarity index 100%
rename from openstack/values_overrides/neutron/gate.yaml
rename to values_overrides/openstack/neutron/gate.yaml
diff --git a/openstack/values_overrides/neutron/netpol.yaml b/values_overrides/openstack/neutron/netpol.yaml
similarity index 100%
rename from openstack/values_overrides/neutron/netpol.yaml
rename to values_overrides/openstack/neutron/netpol.yaml
diff --git a/openstack/values_overrides/neutron/shared-sriov-ovs-dpdk-bond.yaml b/values_overrides/openstack/neutron/shared-sriov-ovs-dpdk-bond.yaml
similarity index 100%
rename from openstack/values_overrides/neutron/shared-sriov-ovs-dpdk-bond.yaml
rename to values_overrides/openstack/neutron/shared-sriov-ovs-dpdk-bond.yaml
diff --git a/openstack/values_overrides/neutron/tf.yaml b/values_overrides/openstack/neutron/tf.yaml
similarity index 100%
rename from openstack/values_overrides/neutron/tf.yaml
rename to values_overrides/openstack/neutron/tf.yaml
diff --git a/openstack/values_overrides/neutron/tls.yaml b/values_overrides/openstack/neutron/tls.yaml
similarity index 100%
rename from openstack/values_overrides/neutron/tls.yaml
rename to values_overrides/openstack/neutron/tls.yaml
diff --git a/openstack/values_overrides/neutron/victoria-ubuntu_focal.yaml b/values_overrides/openstack/neutron/victoria-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/neutron/victoria-ubuntu_focal.yaml
rename to values_overrides/openstack/neutron/victoria-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/neutron/wallaby-ubuntu_focal.yaml b/values_overrides/openstack/neutron/wallaby-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/neutron/wallaby-ubuntu_focal.yaml
rename to values_overrides/openstack/neutron/wallaby-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/neutron/zed-ubuntu_focal.yaml b/values_overrides/openstack/neutron/zed-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/neutron/zed-ubuntu_focal.yaml
rename to values_overrides/openstack/neutron/zed-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/neutron/zed-ubuntu_jammy.yaml b/values_overrides/openstack/neutron/zed-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/neutron/zed-ubuntu_jammy.yaml
rename to values_overrides/openstack/neutron/zed-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/nova/2023.1-ubuntu_focal.yaml b/values_overrides/openstack/nova/2023.1-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/nova/2023.1-ubuntu_focal.yaml
rename to values_overrides/openstack/nova/2023.1-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/nova/2023.1-ubuntu_jammy.yaml b/values_overrides/openstack/nova/2023.1-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/nova/2023.1-ubuntu_jammy.yaml
rename to values_overrides/openstack/nova/2023.1-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/nova/2023.2-ubuntu_jammy.yaml b/values_overrides/openstack/nova/2023.2-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/nova/2023.2-ubuntu_jammy.yaml
rename to values_overrides/openstack/nova/2023.2-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/nova/2024.1-ubuntu_jammy.yaml b/values_overrides/openstack/nova/2024.1-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/nova/2024.1-ubuntu_jammy.yaml
rename to values_overrides/openstack/nova/2024.1-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/nova/2024.2-ubuntu_jammy.yaml b/values_overrides/openstack/nova/2024.2-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/nova/2024.2-ubuntu_jammy.yaml
rename to values_overrides/openstack/nova/2024.2-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/nova/apparmor.yaml b/values_overrides/openstack/nova/apparmor.yaml
similarity index 100%
rename from openstack/values_overrides/nova/apparmor.yaml
rename to values_overrides/openstack/nova/apparmor.yaml
diff --git a/openstack/values_overrides/nova/cntt.yaml b/values_overrides/openstack/nova/cntt.yaml
similarity index 100%
rename from openstack/values_overrides/nova/cntt.yaml
rename to values_overrides/openstack/nova/cntt.yaml
diff --git a/openstack/values_overrides/nova/netpol.yaml b/values_overrides/openstack/nova/netpol.yaml
similarity index 100%
rename from openstack/values_overrides/nova/netpol.yaml
rename to values_overrides/openstack/nova/netpol.yaml
diff --git a/openstack/values_overrides/nova/opensuse_15.yaml b/values_overrides/openstack/nova/opensuse_15.yaml
similarity index 100%
rename from openstack/values_overrides/nova/opensuse_15.yaml
rename to values_overrides/openstack/nova/opensuse_15.yaml
diff --git a/openstack/values_overrides/nova/ssh.yaml b/values_overrides/openstack/nova/ssh.yaml
similarity index 100%
rename from openstack/values_overrides/nova/ssh.yaml
rename to values_overrides/openstack/nova/ssh.yaml
diff --git a/openstack/values_overrides/nova/tf.yaml b/values_overrides/openstack/nova/tf.yaml
similarity index 100%
rename from openstack/values_overrides/nova/tf.yaml
rename to values_overrides/openstack/nova/tf.yaml
diff --git a/openstack/values_overrides/nova/tls-offloading.yaml b/values_overrides/openstack/nova/tls-offloading.yaml
similarity index 100%
rename from openstack/values_overrides/nova/tls-offloading.yaml
rename to values_overrides/openstack/nova/tls-offloading.yaml
diff --git a/openstack/values_overrides/nova/tls.yaml b/values_overrides/openstack/nova/tls.yaml
similarity index 100%
rename from openstack/values_overrides/nova/tls.yaml
rename to values_overrides/openstack/nova/tls.yaml
diff --git a/openstack/values_overrides/nova/victoria-ubuntu_focal.yaml b/values_overrides/openstack/nova/victoria-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/nova/victoria-ubuntu_focal.yaml
rename to values_overrides/openstack/nova/victoria-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/nova/wallaby-ubuntu_focal.yaml b/values_overrides/openstack/nova/wallaby-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/nova/wallaby-ubuntu_focal.yaml
rename to values_overrides/openstack/nova/wallaby-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/nova/wallaby.yaml b/values_overrides/openstack/nova/wallaby.yaml
similarity index 100%
rename from openstack/values_overrides/nova/wallaby.yaml
rename to values_overrides/openstack/nova/wallaby.yaml
diff --git a/openstack/values_overrides/nova/zed-ubuntu_focal.yaml b/values_overrides/openstack/nova/zed-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/nova/zed-ubuntu_focal.yaml
rename to values_overrides/openstack/nova/zed-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/nova/zed-ubuntu_jammy.yaml b/values_overrides/openstack/nova/zed-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/nova/zed-ubuntu_jammy.yaml
rename to values_overrides/openstack/nova/zed-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/openvswitch/apparmor.yaml b/values_overrides/openstack/openvswitch/apparmor.yaml
similarity index 100%
rename from openstack/values_overrides/openvswitch/apparmor.yaml
rename to values_overrides/openstack/openvswitch/apparmor.yaml
diff --git a/openstack/values_overrides/openvswitch/dpdk-opensuse_15.yaml b/values_overrides/openstack/openvswitch/dpdk-opensuse_15.yaml
similarity index 100%
rename from openstack/values_overrides/openvswitch/dpdk-opensuse_15.yaml
rename to values_overrides/openstack/openvswitch/dpdk-opensuse_15.yaml
diff --git a/openstack/values_overrides/openvswitch/dpdk-ubuntu_bionic.yaml b/values_overrides/openstack/openvswitch/dpdk-ubuntu_bionic.yaml
similarity index 100%
rename from openstack/values_overrides/openvswitch/dpdk-ubuntu_bionic.yaml
rename to values_overrides/openstack/openvswitch/dpdk-ubuntu_bionic.yaml
diff --git a/openstack/values_overrides/openvswitch/netpol.yaml b/values_overrides/openstack/openvswitch/netpol.yaml
similarity index 100%
rename from openstack/values_overrides/openvswitch/netpol.yaml
rename to values_overrides/openstack/openvswitch/netpol.yaml
diff --git a/openstack/values_overrides/openvswitch/vswitchd-probes.yaml b/values_overrides/openstack/openvswitch/vswitchd-probes.yaml
similarity index 100%
rename from openstack/values_overrides/openvswitch/vswitchd-probes.yaml
rename to values_overrides/openstack/openvswitch/vswitchd-probes.yaml
diff --git a/openstack/values_overrides/placement/2023.1-ubuntu_focal.yaml b/values_overrides/openstack/placement/2023.1-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/placement/2023.1-ubuntu_focal.yaml
rename to values_overrides/openstack/placement/2023.1-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/placement/2023.1-ubuntu_jammy.yaml b/values_overrides/openstack/placement/2023.1-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/placement/2023.1-ubuntu_jammy.yaml
rename to values_overrides/openstack/placement/2023.1-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/placement/2023.2-ubuntu_jammy.yaml b/values_overrides/openstack/placement/2023.2-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/placement/2023.2-ubuntu_jammy.yaml
rename to values_overrides/openstack/placement/2023.2-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/placement/2024.1-ubuntu_jammy.yaml b/values_overrides/openstack/placement/2024.1-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/placement/2024.1-ubuntu_jammy.yaml
rename to values_overrides/openstack/placement/2024.1-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/placement/2024.2-ubuntu_jammy.yaml b/values_overrides/openstack/placement/2024.2-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/placement/2024.2-ubuntu_jammy.yaml
rename to values_overrides/openstack/placement/2024.2-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/placement/apparmor.yaml b/values_overrides/openstack/placement/apparmor.yaml
similarity index 100%
rename from openstack/values_overrides/placement/apparmor.yaml
rename to values_overrides/openstack/placement/apparmor.yaml
diff --git a/openstack/values_overrides/placement/netpol.yaml b/values_overrides/openstack/placement/netpol.yaml
similarity index 100%
rename from openstack/values_overrides/placement/netpol.yaml
rename to values_overrides/openstack/placement/netpol.yaml
diff --git a/openstack/values_overrides/placement/tls.yaml b/values_overrides/openstack/placement/tls.yaml
similarity index 100%
rename from openstack/values_overrides/placement/tls.yaml
rename to values_overrides/openstack/placement/tls.yaml
diff --git a/openstack/values_overrides/placement/train-ubuntu_bionic.yaml b/values_overrides/openstack/placement/train-ubuntu_bionic.yaml
similarity index 100%
rename from openstack/values_overrides/placement/train-ubuntu_bionic.yaml
rename to values_overrides/openstack/placement/train-ubuntu_bionic.yaml
diff --git a/openstack/values_overrides/placement/victoria-ubuntu_focal.yaml b/values_overrides/openstack/placement/victoria-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/placement/victoria-ubuntu_focal.yaml
rename to values_overrides/openstack/placement/victoria-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/placement/wallaby-ubuntu_focal.yaml b/values_overrides/openstack/placement/wallaby-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/placement/wallaby-ubuntu_focal.yaml
rename to values_overrides/openstack/placement/wallaby-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/placement/zed-ubuntu_focal.yaml b/values_overrides/openstack/placement/zed-ubuntu_focal.yaml
similarity index 100%
rename from openstack/values_overrides/placement/zed-ubuntu_focal.yaml
rename to values_overrides/openstack/placement/zed-ubuntu_focal.yaml
diff --git a/openstack/values_overrides/placement/zed-ubuntu_jammy.yaml b/values_overrides/openstack/placement/zed-ubuntu_jammy.yaml
similarity index 100%
rename from openstack/values_overrides/placement/zed-ubuntu_jammy.yaml
rename to values_overrides/openstack/placement/zed-ubuntu_jammy.yaml
diff --git a/openstack/values_overrides/rabbitmq/apparmor.yaml b/values_overrides/openstack/rabbitmq/apparmor.yaml
similarity index 100%
rename from openstack/values_overrides/rabbitmq/apparmor.yaml
rename to values_overrides/openstack/rabbitmq/apparmor.yaml
diff --git a/openstack/values_overrides/rabbitmq/netpol.yaml b/values_overrides/openstack/rabbitmq/netpol.yaml
similarity index 100%
rename from openstack/values_overrides/rabbitmq/netpol.yaml
rename to values_overrides/openstack/rabbitmq/netpol.yaml
diff --git a/openstack/values_overrides/rabbitmq/tls.yaml b/values_overrides/openstack/rabbitmq/tls.yaml
similarity index 100%
rename from openstack/values_overrides/rabbitmq/tls.yaml
rename to values_overrides/openstack/rabbitmq/tls.yaml
diff --git a/placement/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/placement/2023.1-ubuntu_focal.yaml
similarity index 100%
rename from placement/values_overrides/2023.1-ubuntu_focal.yaml
rename to values_overrides/placement/2023.1-ubuntu_focal.yaml
diff --git a/placement/values_overrides/2023.1-ubuntu_jammy.yaml b/values_overrides/placement/2023.1-ubuntu_jammy.yaml
similarity index 100%
rename from placement/values_overrides/2023.1-ubuntu_jammy.yaml
rename to values_overrides/placement/2023.1-ubuntu_jammy.yaml
diff --git a/placement/values_overrides/2023.2-ubuntu_jammy.yaml b/values_overrides/placement/2023.2-ubuntu_jammy.yaml
similarity index 100%
rename from placement/values_overrides/2023.2-ubuntu_jammy.yaml
rename to values_overrides/placement/2023.2-ubuntu_jammy.yaml
diff --git a/placement/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/placement/2024.1-ubuntu_jammy.yaml
similarity index 100%
rename from placement/values_overrides/2024.1-ubuntu_jammy.yaml
rename to values_overrides/placement/2024.1-ubuntu_jammy.yaml
diff --git a/placement/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/placement/2024.2-ubuntu_jammy.yaml
similarity index 100%
rename from placement/values_overrides/2024.2-ubuntu_jammy.yaml
rename to values_overrides/placement/2024.2-ubuntu_jammy.yaml
diff --git a/placement/values_overrides/annotations.yaml b/values_overrides/placement/annotations.yaml
similarity index 100%
rename from placement/values_overrides/annotations.yaml
rename to values_overrides/placement/annotations.yaml
diff --git a/placement/values_overrides/apparmor.yaml b/values_overrides/placement/apparmor.yaml
similarity index 100%
rename from placement/values_overrides/apparmor.yaml
rename to values_overrides/placement/apparmor.yaml
diff --git a/placement/values_overrides/netpol.yaml b/values_overrides/placement/netpol.yaml
similarity index 100%
rename from placement/values_overrides/netpol.yaml
rename to values_overrides/placement/netpol.yaml
diff --git a/placement/values_overrides/tls-offloading.yaml b/values_overrides/placement/tls-offloading.yaml
similarity index 100%
rename from placement/values_overrides/tls-offloading.yaml
rename to values_overrides/placement/tls-offloading.yaml
diff --git a/placement/values_overrides/tls.yaml b/values_overrides/placement/tls.yaml
similarity index 100%
rename from placement/values_overrides/tls.yaml
rename to values_overrides/placement/tls.yaml
diff --git a/placement/values_overrides/victoria-ubuntu_focal.yaml b/values_overrides/placement/victoria-ubuntu_focal.yaml
similarity index 100%
rename from placement/values_overrides/victoria-ubuntu_focal.yaml
rename to values_overrides/placement/victoria-ubuntu_focal.yaml
diff --git a/placement/values_overrides/wallaby-ubuntu_focal.yaml b/values_overrides/placement/wallaby-ubuntu_focal.yaml
similarity index 100%
rename from placement/values_overrides/wallaby-ubuntu_focal.yaml
rename to values_overrides/placement/wallaby-ubuntu_focal.yaml
diff --git a/placement/values_overrides/xena-ubuntu_focal.yaml b/values_overrides/placement/xena-ubuntu_focal.yaml
similarity index 100%
rename from placement/values_overrides/xena-ubuntu_focal.yaml
rename to values_overrides/placement/xena-ubuntu_focal.yaml
diff --git a/placement/values_overrides/yoga-ubuntu_focal.yaml b/values_overrides/placement/yoga-ubuntu_focal.yaml
similarity index 100%
rename from placement/values_overrides/yoga-ubuntu_focal.yaml
rename to values_overrides/placement/yoga-ubuntu_focal.yaml
diff --git a/placement/values_overrides/zed-ubuntu_focal.yaml b/values_overrides/placement/zed-ubuntu_focal.yaml
similarity index 100%
rename from placement/values_overrides/zed-ubuntu_focal.yaml
rename to values_overrides/placement/zed-ubuntu_focal.yaml
diff --git a/placement/values_overrides/zed-ubuntu_jammy.yaml b/values_overrides/placement/zed-ubuntu_jammy.yaml
similarity index 100%
rename from placement/values_overrides/zed-ubuntu_jammy.yaml
rename to values_overrides/placement/zed-ubuntu_jammy.yaml
diff --git a/rally/values_overrides/annotations.yaml b/values_overrides/rally/annotations.yaml
similarity index 100%
rename from rally/values_overrides/annotations.yaml
rename to values_overrides/rally/annotations.yaml
diff --git a/rally/values_overrides/tls-offloading.yaml b/values_overrides/rally/tls-offloading.yaml
similarity index 100%
rename from rally/values_overrides/tls-offloading.yaml
rename to values_overrides/rally/tls-offloading.yaml
diff --git a/senlin/values_overrides/annotations.yaml b/values_overrides/senlin/annotations.yaml
similarity index 100%
rename from senlin/values_overrides/annotations.yaml
rename to values_overrides/senlin/annotations.yaml
diff --git a/tacker/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/tacker/2023.1-ubuntu_focal.yaml
similarity index 100%
rename from tacker/values_overrides/2023.1-ubuntu_focal.yaml
rename to values_overrides/tacker/2023.1-ubuntu_focal.yaml
diff --git a/tacker/values_overrides/2023.1-ubuntu_jammy.yaml b/values_overrides/tacker/2023.1-ubuntu_jammy.yaml
similarity index 100%
rename from tacker/values_overrides/2023.1-ubuntu_jammy.yaml
rename to values_overrides/tacker/2023.1-ubuntu_jammy.yaml
diff --git a/tacker/values_overrides/2023.2-ubuntu_jammy.yaml b/values_overrides/tacker/2023.2-ubuntu_jammy.yaml
similarity index 100%
rename from tacker/values_overrides/2023.2-ubuntu_jammy.yaml
rename to values_overrides/tacker/2023.2-ubuntu_jammy.yaml
diff --git a/tacker/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/tacker/2024.1-ubuntu_jammy.yaml
similarity index 100%
rename from tacker/values_overrides/2024.1-ubuntu_jammy.yaml
rename to values_overrides/tacker/2024.1-ubuntu_jammy.yaml
diff --git a/tacker/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/tacker/2024.2-ubuntu_jammy.yaml
similarity index 100%
rename from tacker/values_overrides/2024.2-ubuntu_jammy.yaml
rename to values_overrides/tacker/2024.2-ubuntu_jammy.yaml
diff --git a/tacker/values_overrides/annotations.yaml b/values_overrides/tacker/annotations.yaml
similarity index 100%
rename from tacker/values_overrides/annotations.yaml
rename to values_overrides/tacker/annotations.yaml
diff --git a/tacker/values_overrides/zed-ubuntu_focal.yaml b/values_overrides/tacker/zed-ubuntu_focal.yaml
similarity index 100%
rename from tacker/values_overrides/zed-ubuntu_focal.yaml
rename to values_overrides/tacker/zed-ubuntu_focal.yaml
diff --git a/tacker/values_overrides/zed-ubuntu_jammy.yaml b/values_overrides/tacker/zed-ubuntu_jammy.yaml
similarity index 100%
rename from tacker/values_overrides/zed-ubuntu_jammy.yaml
rename to values_overrides/tacker/zed-ubuntu_jammy.yaml
diff --git a/tempest/values_overrides/annotations.yaml b/values_overrides/tempest/annotations.yaml
similarity index 100%
rename from tempest/values_overrides/annotations.yaml
rename to values_overrides/tempest/annotations.yaml
diff --git a/zuul.d/2024.1.yaml b/zuul.d/2024.1.yaml
index d729122bfd..025814aab9 100644
--- a/zuul.d/2024.1.yaml
+++ b/zuul.d/2024.1.yaml
@@ -103,6 +103,7 @@
         container_distro_version: jammy
         feature_gates: metallb
 
+
 - job:
     name: openstack-helm-compute-kit-flannel-metallb-2024-1-ubuntu_jammy
     parent: openstack-helm-compute-kit