diff --git a/classes/cluster/aaa-ha-freeipa/README.adoc b/classes/cluster_deprecated/aaa-ha-freeipa/README.adoc
similarity index 100%
rename from classes/cluster/aaa-ha-freeipa/README.adoc
rename to classes/cluster_deprecated/aaa-ha-freeipa/README.adoc
diff --git a/classes/cluster/aaa-ha-freeipa/aaa/freeipa_client.yml b/classes/cluster_deprecated/aaa-ha-freeipa/aaa/freeipa_client.yml
similarity index 100%
rename from classes/cluster/aaa-ha-freeipa/aaa/freeipa_client.yml
rename to classes/cluster_deprecated/aaa-ha-freeipa/aaa/freeipa_client.yml
diff --git a/classes/cluster/aaa-ha-freeipa/aaa/freeipa_server.yml b/classes/cluster_deprecated/aaa-ha-freeipa/aaa/freeipa_server.yml
similarity index 100%
rename from classes/cluster/aaa-ha-freeipa/aaa/freeipa_server.yml
rename to classes/cluster_deprecated/aaa-ha-freeipa/aaa/freeipa_server.yml
diff --git a/classes/cluster/aaa-ha-freeipa/aaa/init.yml b/classes/cluster_deprecated/aaa-ha-freeipa/aaa/init.yml
similarity index 100%
rename from classes/cluster/aaa-ha-freeipa/aaa/init.yml
rename to classes/cluster_deprecated/aaa-ha-freeipa/aaa/init.yml
diff --git a/classes/cluster/aaa-ha-freeipa/aaa/linux-system-single/debian.yml b/classes/cluster_deprecated/aaa-ha-freeipa/aaa/linux-system-single/debian.yml
similarity index 100%
rename from classes/cluster/aaa-ha-freeipa/aaa/linux-system-single/debian.yml
rename to classes/cluster_deprecated/aaa-ha-freeipa/aaa/linux-system-single/debian.yml
diff --git a/classes/cluster/aaa-ha-freeipa/aaa/linux-system-single/init.yml b/classes/cluster_deprecated/aaa-ha-freeipa/aaa/linux-system-single/init.yml
similarity index 100%
rename from classes/cluster/aaa-ha-freeipa/aaa/linux-system-single/init.yml
rename to classes/cluster_deprecated/aaa-ha-freeipa/aaa/linux-system-single/init.yml
diff --git a/classes/cluster/aaa-ha-freeipa/aaa/linux-system-single/rhel.yml b/classes/cluster_deprecated/aaa-ha-freeipa/aaa/linux-system-single/rhel.yml
similarity index 100%
rename from classes/cluster/aaa-ha-freeipa/aaa/linux-system-single/rhel.yml
rename to classes/cluster_deprecated/aaa-ha-freeipa/aaa/linux-system-single/rhel.yml
diff --git a/classes/cluster/aaa-ha-freeipa/infra/config.yml b/classes/cluster_deprecated/aaa-ha-freeipa/infra/config.yml
similarity index 100%
rename from classes/cluster/aaa-ha-freeipa/infra/config.yml
rename to classes/cluster_deprecated/aaa-ha-freeipa/infra/config.yml
diff --git a/classes/cluster/aaa-ha-freeipa/infra/idm.yml b/classes/cluster_deprecated/aaa-ha-freeipa/infra/idm.yml
similarity index 100%
rename from classes/cluster/aaa-ha-freeipa/infra/idm.yml
rename to classes/cluster_deprecated/aaa-ha-freeipa/infra/idm.yml
diff --git a/classes/cluster/aaa-ha-freeipa/infra/init.yml b/classes/cluster_deprecated/aaa-ha-freeipa/infra/init.yml
similarity index 100%
rename from classes/cluster/aaa-ha-freeipa/infra/init.yml
rename to classes/cluster_deprecated/aaa-ha-freeipa/infra/init.yml
diff --git a/classes/cluster/aaa-ha-freeipa/infra/prx.yml b/classes/cluster_deprecated/aaa-ha-freeipa/infra/prx.yml
similarity index 100%
rename from classes/cluster/aaa-ha-freeipa/infra/prx.yml
rename to classes/cluster_deprecated/aaa-ha-freeipa/infra/prx.yml
diff --git a/classes/cluster/aaa-ha-freeipa/init.yml b/classes/cluster_deprecated/aaa-ha-freeipa/init.yml
similarity index 100%
rename from classes/cluster/aaa-ha-freeipa/init.yml
rename to classes/cluster_deprecated/aaa-ha-freeipa/init.yml
diff --git a/classes/cluster/ceph-ha/.env b/classes/cluster_deprecated/ceph-ha/.env
similarity index 100%
rename from classes/cluster/ceph-ha/.env
rename to classes/cluster_deprecated/ceph-ha/.env
diff --git a/classes/cluster/ceph-ha/ceph/cephfs.yml b/classes/cluster_deprecated/ceph-ha/ceph/cephfs.yml
similarity index 100%
rename from classes/cluster/ceph-ha/ceph/cephfs.yml
rename to classes/cluster_deprecated/ceph-ha/ceph/cephfs.yml
diff --git a/classes/cluster/ceph-ha/ceph/common.yml b/classes/cluster_deprecated/ceph-ha/ceph/common.yml
similarity index 100%
rename from classes/cluster/ceph-ha/ceph/common.yml
rename to classes/cluster_deprecated/ceph-ha/ceph/common.yml
diff --git a/classes/cluster/ceph-ha/ceph/init.yml b/classes/cluster_deprecated/ceph-ha/ceph/init.yml
similarity index 100%
rename from classes/cluster/ceph-ha/ceph/init.yml
rename to classes/cluster_deprecated/ceph-ha/ceph/init.yml
diff --git a/classes/cluster/ceph-ha/ceph/mon.yml b/classes/cluster_deprecated/ceph-ha/ceph/mon.yml
similarity index 100%
rename from classes/cluster/ceph-ha/ceph/mon.yml
rename to classes/cluster_deprecated/ceph-ha/ceph/mon.yml
diff --git a/classes/cluster/ceph-ha/ceph/osd.yml b/classes/cluster_deprecated/ceph-ha/ceph/osd.yml
similarity index 100%
rename from classes/cluster/ceph-ha/ceph/osd.yml
rename to classes/cluster_deprecated/ceph-ha/ceph/osd.yml
diff --git a/classes/cluster/ceph-ha/ceph/rgw.yml b/classes/cluster_deprecated/ceph-ha/ceph/rgw.yml
similarity index 100%
rename from classes/cluster/ceph-ha/ceph/rgw.yml
rename to classes/cluster_deprecated/ceph-ha/ceph/rgw.yml
diff --git a/classes/cluster/ceph-ha/ceph/setup.yml b/classes/cluster_deprecated/ceph-ha/ceph/setup.yml
similarity index 100%
rename from classes/cluster/ceph-ha/ceph/setup.yml
rename to classes/cluster_deprecated/ceph-ha/ceph/setup.yml
diff --git a/classes/cluster/ceph-ha/infra/config.yml b/classes/cluster_deprecated/ceph-ha/infra/config.yml
similarity index 100%
rename from classes/cluster/ceph-ha/infra/config.yml
rename to classes/cluster_deprecated/ceph-ha/infra/config.yml
diff --git a/classes/cluster/ceph-ha/infra/init.yml b/classes/cluster_deprecated/ceph-ha/infra/init.yml
similarity index 100%
rename from classes/cluster/ceph-ha/infra/init.yml
rename to classes/cluster_deprecated/ceph-ha/infra/init.yml
diff --git a/classes/cluster/k8s-aio-calico/.env b/classes/cluster_deprecated/k8s-aio-calico/.env
similarity index 100%
rename from classes/cluster/k8s-aio-calico/.env
rename to classes/cluster_deprecated/k8s-aio-calico/.env
diff --git a/classes/cluster/k8s-aio-calico/infra/config.yml b/classes/cluster_deprecated/k8s-aio-calico/infra/config.yml
similarity index 100%
rename from classes/cluster/k8s-aio-calico/infra/config.yml
rename to classes/cluster_deprecated/k8s-aio-calico/infra/config.yml
diff --git a/classes/cluster/k8s-aio-calico/infra/init.yml b/classes/cluster_deprecated/k8s-aio-calico/infra/init.yml
similarity index 100%
rename from classes/cluster/k8s-aio-calico/infra/init.yml
rename to classes/cluster_deprecated/k8s-aio-calico/infra/init.yml
diff --git a/classes/cluster/k8s-aio-calico/init.yml b/classes/cluster_deprecated/k8s-aio-calico/init.yml
similarity index 100%
rename from classes/cluster/k8s-aio-calico/init.yml
rename to classes/cluster_deprecated/k8s-aio-calico/init.yml
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/compute.yml b/classes/cluster_deprecated/k8s-aio-calico/kubernetes/compute.yml
similarity index 100%
rename from classes/cluster/k8s-aio-calico/kubernetes/compute.yml
rename to classes/cluster_deprecated/k8s-aio-calico/kubernetes/compute.yml
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/control.yml b/classes/cluster_deprecated/k8s-aio-calico/kubernetes/control.yml
similarity index 100%
rename from classes/cluster/k8s-aio-calico/kubernetes/control.yml
rename to classes/cluster_deprecated/k8s-aio-calico/kubernetes/control.yml
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/init.yml b/classes/cluster_deprecated/k8s-aio-calico/kubernetes/init.yml
similarity index 100%
rename from classes/cluster/k8s-aio-calico/kubernetes/init.yml
rename to classes/cluster_deprecated/k8s-aio-calico/kubernetes/init.yml
diff --git a/classes/cluster/k8s-aio-contrail/.env b/classes/cluster_deprecated/k8s-aio-contrail/.env
similarity index 100%
rename from classes/cluster/k8s-aio-contrail/.env
rename to classes/cluster_deprecated/k8s-aio-contrail/.env
diff --git a/classes/cluster/k8s-aio-contrail/infra/config.yml b/classes/cluster_deprecated/k8s-aio-contrail/infra/config.yml
similarity index 100%
rename from classes/cluster/k8s-aio-contrail/infra/config.yml
rename to classes/cluster_deprecated/k8s-aio-contrail/infra/config.yml
diff --git a/classes/cluster/k8s-aio-contrail/infra/init.yml b/classes/cluster_deprecated/k8s-aio-contrail/infra/init.yml
similarity index 100%
rename from classes/cluster/k8s-aio-contrail/infra/init.yml
rename to classes/cluster_deprecated/k8s-aio-contrail/infra/init.yml
diff --git a/classes/cluster/k8s-aio-contrail/init.yml b/classes/cluster_deprecated/k8s-aio-contrail/init.yml
similarity index 100%
rename from classes/cluster/k8s-aio-contrail/init.yml
rename to classes/cluster_deprecated/k8s-aio-contrail/init.yml
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml b/classes/cluster_deprecated/k8s-aio-contrail/kubernetes/compute.yml
similarity index 100%
rename from classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
rename to classes/cluster_deprecated/k8s-aio-contrail/kubernetes/compute.yml
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/control.yml b/classes/cluster_deprecated/k8s-aio-contrail/kubernetes/control.yml
similarity index 100%
rename from classes/cluster/k8s-aio-contrail/kubernetes/control.yml
rename to classes/cluster_deprecated/k8s-aio-contrail/kubernetes/control.yml
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/init.yml b/classes/cluster_deprecated/k8s-aio-contrail/kubernetes/init.yml
similarity index 100%
rename from classes/cluster/k8s-aio-contrail/kubernetes/init.yml
rename to classes/cluster_deprecated/k8s-aio-contrail/kubernetes/init.yml
diff --git a/classes/cluster/k8s-aio-contrail/opencontrail/compute.yml b/classes/cluster_deprecated/k8s-aio-contrail/opencontrail/compute.yml
similarity index 100%
rename from classes/cluster/k8s-aio-contrail/opencontrail/compute.yml
rename to classes/cluster_deprecated/k8s-aio-contrail/opencontrail/compute.yml
diff --git a/classes/cluster/k8s-aio-contrail/opencontrail/control.yml b/classes/cluster_deprecated/k8s-aio-contrail/opencontrail/control.yml
similarity index 100%
rename from classes/cluster/k8s-aio-contrail/opencontrail/control.yml
rename to classes/cluster_deprecated/k8s-aio-contrail/opencontrail/control.yml
diff --git a/classes/cluster/k8s-aio-contrail/opencontrail/init.yml b/classes/cluster_deprecated/k8s-aio-contrail/opencontrail/init.yml
similarity index 100%
rename from classes/cluster/k8s-aio-contrail/opencontrail/init.yml
rename to classes/cluster_deprecated/k8s-aio-contrail/opencontrail/init.yml
diff --git a/classes/cluster/k8s-compact/infra/init.yml b/classes/cluster_deprecated/k8s-compact/infra/init.yml
similarity index 100%
rename from classes/cluster/k8s-compact/infra/init.yml
rename to classes/cluster_deprecated/k8s-compact/infra/init.yml
diff --git a/classes/cluster/k8s-compact/init.yml b/classes/cluster_deprecated/k8s-compact/init.yml
similarity index 100%
rename from classes/cluster/k8s-compact/init.yml
rename to classes/cluster_deprecated/k8s-compact/init.yml
diff --git a/classes/cluster/k8s-compact/kubernetes/compute.yml b/classes/cluster_deprecated/k8s-compact/kubernetes/compute.yml
similarity index 100%
rename from classes/cluster/k8s-compact/kubernetes/compute.yml
rename to classes/cluster_deprecated/k8s-compact/kubernetes/compute.yml
diff --git a/classes/cluster/k8s-compact/kubernetes/control.yml b/classes/cluster_deprecated/k8s-compact/kubernetes/control.yml
similarity index 100%
rename from classes/cluster/k8s-compact/kubernetes/control.yml
rename to classes/cluster_deprecated/k8s-compact/kubernetes/control.yml
diff --git a/classes/cluster/k8s-compact/kubernetes/init.yml b/classes/cluster_deprecated/k8s-compact/kubernetes/init.yml
similarity index 100%
rename from classes/cluster/k8s-compact/kubernetes/init.yml
rename to classes/cluster_deprecated/k8s-compact/kubernetes/init.yml
diff --git a/classes/cluster/model-manager/infra/config.yml b/classes/cluster_deprecated/model-manager/infra/config.yml
similarity index 100%
rename from classes/cluster/model-manager/infra/config.yml
rename to classes/cluster_deprecated/model-manager/infra/config.yml
diff --git a/classes/cluster/model-manager/infra/init.yml b/classes/cluster_deprecated/model-manager/infra/init.yml
similarity index 100%
rename from classes/cluster/model-manager/infra/init.yml
rename to classes/cluster_deprecated/model-manager/infra/init.yml
diff --git a/classes/cluster/model-manager/init.yml b/classes/cluster_deprecated/model-manager/init.yml
similarity index 100%
rename from classes/cluster/model-manager/init.yml
rename to classes/cluster_deprecated/model-manager/init.yml
diff --git a/classes/cluster/model-manager/model_manager/dashboard.yml b/classes/cluster_deprecated/model-manager/model_manager/dashboard.yml
similarity index 100%
rename from classes/cluster/model-manager/model_manager/dashboard.yml
rename to classes/cluster_deprecated/model-manager/model_manager/dashboard.yml
diff --git a/classes/cluster/model-manager/model_manager/identity.yml b/classes/cluster_deprecated/model-manager/model_manager/identity.yml
similarity index 100%
rename from classes/cluster/model-manager/model_manager/identity.yml
rename to classes/cluster_deprecated/model-manager/model_manager/identity.yml
diff --git a/classes/cluster/model-manager/model_manager/init.yml b/classes/cluster_deprecated/model-manager/model_manager/init.yml
similarity index 100%
rename from classes/cluster/model-manager/model_manager/init.yml
rename to classes/cluster_deprecated/model-manager/model_manager/init.yml
diff --git a/classes/cluster/model-manager/model_manager/proxy.yml b/classes/cluster_deprecated/model-manager/model_manager/proxy.yml
similarity index 100%
rename from classes/cluster/model-manager/model_manager/proxy.yml
rename to classes/cluster_deprecated/model-manager/model_manager/proxy.yml
diff --git a/classes/cluster/os-aio-contrail/infra/config.yml b/classes/cluster_deprecated/os-aio-contrail/infra/config.yml
similarity index 100%
rename from classes/cluster/os-aio-contrail/infra/config.yml
rename to classes/cluster_deprecated/os-aio-contrail/infra/config.yml
diff --git a/classes/cluster/os-aio-contrail/infra/init.yml b/classes/cluster_deprecated/os-aio-contrail/infra/init.yml
similarity index 100%
rename from classes/cluster/os-aio-contrail/infra/init.yml
rename to classes/cluster_deprecated/os-aio-contrail/infra/init.yml
diff --git a/classes/cluster/os-aio-contrail/init.yml b/classes/cluster_deprecated/os-aio-contrail/init.yml
similarity index 100%
rename from classes/cluster/os-aio-contrail/init.yml
rename to classes/cluster_deprecated/os-aio-contrail/init.yml
diff --git a/classes/cluster/os-aio-contrail/opencontrail/control.yml b/classes/cluster_deprecated/os-aio-contrail/opencontrail/control.yml
similarity index 100%
rename from classes/cluster/os-aio-contrail/opencontrail/control.yml
rename to classes/cluster_deprecated/os-aio-contrail/opencontrail/control.yml
diff --git a/classes/cluster/os-aio-contrail/opencontrail/init.yml b/classes/cluster_deprecated/os-aio-contrail/opencontrail/init.yml
similarity index 100%
rename from classes/cluster/os-aio-contrail/opencontrail/init.yml
rename to classes/cluster_deprecated/os-aio-contrail/opencontrail/init.yml
diff --git a/classes/cluster/os-aio-contrail/openstack/compute.yml b/classes/cluster_deprecated/os-aio-contrail/openstack/compute.yml
similarity index 100%
rename from classes/cluster/os-aio-contrail/openstack/compute.yml
rename to classes/cluster_deprecated/os-aio-contrail/openstack/compute.yml
diff --git a/classes/cluster/os-aio-contrail/openstack/control.yml b/classes/cluster_deprecated/os-aio-contrail/openstack/control.yml
similarity index 100%
rename from classes/cluster/os-aio-contrail/openstack/control.yml
rename to classes/cluster_deprecated/os-aio-contrail/openstack/control.yml
diff --git a/classes/cluster/os-aio-contrail/openstack/dashboard.yml b/classes/cluster_deprecated/os-aio-contrail/openstack/dashboard.yml
similarity index 100%
rename from classes/cluster/os-aio-contrail/openstack/dashboard.yml
rename to classes/cluster_deprecated/os-aio-contrail/openstack/dashboard.yml
diff --git a/classes/cluster/os-aio-contrail/openstack/init.yml b/classes/cluster_deprecated/os-aio-contrail/openstack/init.yml
similarity index 100%
rename from classes/cluster/os-aio-contrail/openstack/init.yml
rename to classes/cluster_deprecated/os-aio-contrail/openstack/init.yml
diff --git a/classes/cluster/os-aio-contrail/openstack/proxy.yml b/classes/cluster_deprecated/os-aio-contrail/openstack/proxy.yml
similarity index 100%
rename from classes/cluster/os-aio-contrail/openstack/proxy.yml
rename to classes/cluster_deprecated/os-aio-contrail/openstack/proxy.yml
diff --git a/classes/cluster/os-aio-ovs/infra/config.yml b/classes/cluster_deprecated/os-aio-ovs/infra/config.yml
similarity index 100%
rename from classes/cluster/os-aio-ovs/infra/config.yml
rename to classes/cluster_deprecated/os-aio-ovs/infra/config.yml
diff --git a/classes/cluster/os-aio-ovs/infra/init.yml b/classes/cluster_deprecated/os-aio-ovs/infra/init.yml
similarity index 100%
rename from classes/cluster/os-aio-ovs/infra/init.yml
rename to classes/cluster_deprecated/os-aio-ovs/infra/init.yml
diff --git a/classes/cluster/os-aio-ovs/init.yml b/classes/cluster_deprecated/os-aio-ovs/init.yml
similarity index 100%
rename from classes/cluster/os-aio-ovs/init.yml
rename to classes/cluster_deprecated/os-aio-ovs/init.yml
diff --git a/classes/cluster/os-aio-ovs/openstack/compute.yml b/classes/cluster_deprecated/os-aio-ovs/openstack/compute.yml
similarity index 100%
rename from classes/cluster/os-aio-ovs/openstack/compute.yml
rename to classes/cluster_deprecated/os-aio-ovs/openstack/compute.yml
diff --git a/classes/cluster/os-aio-ovs/openstack/control.yml b/classes/cluster_deprecated/os-aio-ovs/openstack/control.yml
similarity index 100%
rename from classes/cluster/os-aio-ovs/openstack/control.yml
rename to classes/cluster_deprecated/os-aio-ovs/openstack/control.yml
diff --git a/classes/cluster/os-aio-ovs/openstack/dashboard.yml b/classes/cluster_deprecated/os-aio-ovs/openstack/dashboard.yml
similarity index 100%
rename from classes/cluster/os-aio-ovs/openstack/dashboard.yml
rename to classes/cluster_deprecated/os-aio-ovs/openstack/dashboard.yml
diff --git a/classes/cluster/os-aio-ovs/openstack/gateway.yml b/classes/cluster_deprecated/os-aio-ovs/openstack/gateway.yml
similarity index 100%
rename from classes/cluster/os-aio-ovs/openstack/gateway.yml
rename to classes/cluster_deprecated/os-aio-ovs/openstack/gateway.yml
diff --git a/classes/cluster/os-aio-ovs/openstack/init.yml b/classes/cluster_deprecated/os-aio-ovs/openstack/init.yml
similarity index 100%
rename from classes/cluster/os-aio-ovs/openstack/init.yml
rename to classes/cluster_deprecated/os-aio-ovs/openstack/init.yml
diff --git a/classes/cluster/os-aio-ovs/openstack/proxy.yml b/classes/cluster_deprecated/os-aio-ovs/openstack/proxy.yml
similarity index 100%
rename from classes/cluster/os-aio-ovs/openstack/proxy.yml
rename to classes/cluster_deprecated/os-aio-ovs/openstack/proxy.yml
diff --git a/classes/cluster/os-ha-contrail-ironic/infra/config.yml b/classes/cluster_deprecated/os-ha-contrail-ironic/infra/config.yml
similarity index 100%
rename from classes/cluster/os-ha-contrail-ironic/infra/config.yml
rename to classes/cluster_deprecated/os-ha-contrail-ironic/infra/config.yml
diff --git a/classes/cluster/os-ha-contrail-ironic/infra/init.yml b/classes/cluster_deprecated/os-ha-contrail-ironic/infra/init.yml
similarity index 100%
rename from classes/cluster/os-ha-contrail-ironic/infra/init.yml
rename to classes/cluster_deprecated/os-ha-contrail-ironic/infra/init.yml
diff --git a/classes/cluster/os-ha-contrail-ironic/init.yml b/classes/cluster_deprecated/os-ha-contrail-ironic/init.yml
similarity index 100%
rename from classes/cluster/os-ha-contrail-ironic/init.yml
rename to classes/cluster_deprecated/os-ha-contrail-ironic/init.yml
diff --git a/classes/cluster/os-ha-contrail-ironic/opencontrail/control.yml b/classes/cluster_deprecated/os-ha-contrail-ironic/opencontrail/control.yml
similarity index 100%
rename from classes/cluster/os-ha-contrail-ironic/opencontrail/control.yml
rename to classes/cluster_deprecated/os-ha-contrail-ironic/opencontrail/control.yml
diff --git a/classes/cluster/os-ha-contrail-ironic/opencontrail/init.yml b/classes/cluster_deprecated/os-ha-contrail-ironic/opencontrail/init.yml
similarity index 100%
rename from classes/cluster/os-ha-contrail-ironic/opencontrail/init.yml
rename to classes/cluster_deprecated/os-ha-contrail-ironic/opencontrail/init.yml
diff --git a/classes/cluster/os-ha-contrail-ironic/opencontrail/tsn.yml b/classes/cluster_deprecated/os-ha-contrail-ironic/opencontrail/tsn.yml
similarity index 100%
rename from classes/cluster/os-ha-contrail-ironic/opencontrail/tsn.yml
rename to classes/cluster_deprecated/os-ha-contrail-ironic/opencontrail/tsn.yml
diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/baremetal.yml b/classes/cluster_deprecated/os-ha-contrail-ironic/openstack/baremetal.yml
similarity index 100%
rename from classes/cluster/os-ha-contrail-ironic/openstack/baremetal.yml
rename to classes/cluster_deprecated/os-ha-contrail-ironic/openstack/baremetal.yml
diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/compute.yml b/classes/cluster_deprecated/os-ha-contrail-ironic/openstack/compute.yml
similarity index 100%
rename from classes/cluster/os-ha-contrail-ironic/openstack/compute.yml
rename to classes/cluster_deprecated/os-ha-contrail-ironic/openstack/compute.yml
diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/control.yml b/classes/cluster_deprecated/os-ha-contrail-ironic/openstack/control.yml
similarity index 100%
rename from classes/cluster/os-ha-contrail-ironic/openstack/control.yml
rename to classes/cluster_deprecated/os-ha-contrail-ironic/openstack/control.yml
diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/dashboard.yml b/classes/cluster_deprecated/os-ha-contrail-ironic/openstack/dashboard.yml
similarity index 100%
rename from classes/cluster/os-ha-contrail-ironic/openstack/dashboard.yml
rename to classes/cluster_deprecated/os-ha-contrail-ironic/openstack/dashboard.yml
diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/init.yml b/classes/cluster_deprecated/os-ha-contrail-ironic/openstack/init.yml
similarity index 100%
rename from classes/cluster/os-ha-contrail-ironic/openstack/init.yml
rename to classes/cluster_deprecated/os-ha-contrail-ironic/openstack/init.yml
diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/proxy.yml b/classes/cluster_deprecated/os-ha-contrail-ironic/openstack/proxy.yml
similarity index 100%
rename from classes/cluster/os-ha-contrail-ironic/openstack/proxy.yml
rename to classes/cluster_deprecated/os-ha-contrail-ironic/openstack/proxy.yml
diff --git a/classes/cluster/os-ha-ovs-ceph/ceph/cephfs.yml b/classes/cluster_deprecated/os-ha-ovs-ceph/ceph/cephfs.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-ceph/ceph/cephfs.yml
rename to classes/cluster_deprecated/os-ha-ovs-ceph/ceph/cephfs.yml
diff --git a/classes/cluster/os-ha-ovs-ceph/ceph/common.yml b/classes/cluster_deprecated/os-ha-ovs-ceph/ceph/common.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-ceph/ceph/common.yml
rename to classes/cluster_deprecated/os-ha-ovs-ceph/ceph/common.yml
diff --git a/classes/cluster/os-ha-ovs-ceph/ceph/init.yml b/classes/cluster_deprecated/os-ha-ovs-ceph/ceph/init.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-ceph/ceph/init.yml
rename to classes/cluster_deprecated/os-ha-ovs-ceph/ceph/init.yml
diff --git a/classes/cluster/os-ha-ovs-ceph/ceph/mon.yml b/classes/cluster_deprecated/os-ha-ovs-ceph/ceph/mon.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-ceph/ceph/mon.yml
rename to classes/cluster_deprecated/os-ha-ovs-ceph/ceph/mon.yml
diff --git a/classes/cluster/os-ha-ovs-ceph/ceph/osd.yml b/classes/cluster_deprecated/os-ha-ovs-ceph/ceph/osd.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-ceph/ceph/osd.yml
rename to classes/cluster_deprecated/os-ha-ovs-ceph/ceph/osd.yml
diff --git a/classes/cluster/os-ha-ovs-ceph/ceph/setup.yml b/classes/cluster_deprecated/os-ha-ovs-ceph/ceph/setup.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-ceph/ceph/setup.yml
rename to classes/cluster_deprecated/os-ha-ovs-ceph/ceph/setup.yml
diff --git a/classes/cluster/os-ha-ovs-ceph/infra/config.yml b/classes/cluster_deprecated/os-ha-ovs-ceph/infra/config.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-ceph/infra/config.yml
rename to classes/cluster_deprecated/os-ha-ovs-ceph/infra/config.yml
diff --git a/classes/cluster/os-ha-ovs-ceph/infra/init.yml b/classes/cluster_deprecated/os-ha-ovs-ceph/infra/init.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-ceph/infra/init.yml
rename to classes/cluster_deprecated/os-ha-ovs-ceph/infra/init.yml
diff --git a/classes/cluster/os-ha-ovs-ceph/init.yml b/classes/cluster_deprecated/os-ha-ovs-ceph/init.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-ceph/init.yml
rename to classes/cluster_deprecated/os-ha-ovs-ceph/init.yml
diff --git a/classes/cluster/os-ha-ovs-ceph/openstack/compute.yml b/classes/cluster_deprecated/os-ha-ovs-ceph/openstack/compute.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-ceph/openstack/compute.yml
rename to classes/cluster_deprecated/os-ha-ovs-ceph/openstack/compute.yml
diff --git a/classes/cluster/os-ha-ovs-ceph/openstack/control.yml b/classes/cluster_deprecated/os-ha-ovs-ceph/openstack/control.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-ceph/openstack/control.yml
rename to classes/cluster_deprecated/os-ha-ovs-ceph/openstack/control.yml
diff --git a/classes/cluster/os-ha-ovs-ceph/openstack/dashboard.yml b/classes/cluster_deprecated/os-ha-ovs-ceph/openstack/dashboard.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-ceph/openstack/dashboard.yml
rename to classes/cluster_deprecated/os-ha-ovs-ceph/openstack/dashboard.yml
diff --git a/classes/cluster/os-ha-ovs-ceph/openstack/gateway.yml b/classes/cluster_deprecated/os-ha-ovs-ceph/openstack/gateway.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-ceph/openstack/gateway.yml
rename to classes/cluster_deprecated/os-ha-ovs-ceph/openstack/gateway.yml
diff --git a/classes/cluster/os-ha-ovs-ceph/openstack/init.yml b/classes/cluster_deprecated/os-ha-ovs-ceph/openstack/init.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-ceph/openstack/init.yml
rename to classes/cluster_deprecated/os-ha-ovs-ceph/openstack/init.yml
diff --git a/classes/cluster/os-ha-ovs-ceph/openstack/proxy.yml b/classes/cluster_deprecated/os-ha-ovs-ceph/openstack/proxy.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-ceph/openstack/proxy.yml
rename to classes/cluster_deprecated/os-ha-ovs-ceph/openstack/proxy.yml
diff --git a/classes/cluster/os-ha-ovs-pike/.env b/classes/cluster_deprecated/os-ha-ovs-pike/.env
similarity index 100%
rename from classes/cluster/os-ha-ovs-pike/.env
rename to classes/cluster_deprecated/os-ha-ovs-pike/.env
diff --git a/classes/cluster/os-ha-ovs-pike/infra/config.yml b/classes/cluster_deprecated/os-ha-ovs-pike/infra/config.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-pike/infra/config.yml
rename to classes/cluster_deprecated/os-ha-ovs-pike/infra/config.yml
diff --git a/classes/cluster/os-ha-ovs-pike/infra/init.yml b/classes/cluster_deprecated/os-ha-ovs-pike/infra/init.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-pike/infra/init.yml
rename to classes/cluster_deprecated/os-ha-ovs-pike/infra/init.yml
diff --git a/classes/cluster/os-ha-ovs-pike/init.yml b/classes/cluster_deprecated/os-ha-ovs-pike/init.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-pike/init.yml
rename to classes/cluster_deprecated/os-ha-ovs-pike/init.yml
diff --git a/classes/cluster/os-ha-ovs-pike/openstack/compute.yml b/classes/cluster_deprecated/os-ha-ovs-pike/openstack/compute.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-pike/openstack/compute.yml
rename to classes/cluster_deprecated/os-ha-ovs-pike/openstack/compute.yml
diff --git a/classes/cluster/os-ha-ovs-pike/openstack/control.yml b/classes/cluster_deprecated/os-ha-ovs-pike/openstack/control.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-pike/openstack/control.yml
rename to classes/cluster_deprecated/os-ha-ovs-pike/openstack/control.yml
diff --git a/classes/cluster/os-ha-ovs-pike/openstack/dashboard.yml b/classes/cluster_deprecated/os-ha-ovs-pike/openstack/dashboard.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-pike/openstack/dashboard.yml
rename to classes/cluster_deprecated/os-ha-ovs-pike/openstack/dashboard.yml
diff --git a/classes/cluster/os-ha-ovs-pike/openstack/gateway.yml b/classes/cluster_deprecated/os-ha-ovs-pike/openstack/gateway.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-pike/openstack/gateway.yml
rename to classes/cluster_deprecated/os-ha-ovs-pike/openstack/gateway.yml
diff --git a/classes/cluster/os-ha-ovs-pike/openstack/init.yml b/classes/cluster_deprecated/os-ha-ovs-pike/openstack/init.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-pike/openstack/init.yml
rename to classes/cluster_deprecated/os-ha-ovs-pike/openstack/init.yml
diff --git a/classes/cluster/os-ha-ovs-pike/openstack/proxy.yml b/classes/cluster_deprecated/os-ha-ovs-pike/openstack/proxy.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-pike/openstack/proxy.yml
rename to classes/cluster_deprecated/os-ha-ovs-pike/openstack/proxy.yml
diff --git a/classes/cluster/os-ha-ovs-syndic/.env b/classes/cluster_deprecated/os-ha-ovs-syndic/.env
similarity index 100%
rename from classes/cluster/os-ha-ovs-syndic/.env
rename to classes/cluster_deprecated/os-ha-ovs-syndic/.env
diff --git a/classes/cluster/os-ha-ovs-syndic/infra/config.yml b/classes/cluster_deprecated/os-ha-ovs-syndic/infra/config.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-syndic/infra/config.yml
rename to classes/cluster_deprecated/os-ha-ovs-syndic/infra/config.yml
diff --git a/classes/cluster/os-ha-ovs-syndic/infra/init.yml b/classes/cluster_deprecated/os-ha-ovs-syndic/infra/init.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-syndic/infra/init.yml
rename to classes/cluster_deprecated/os-ha-ovs-syndic/infra/init.yml
diff --git a/classes/cluster/os-ha-ovs-syndic/init.yml b/classes/cluster_deprecated/os-ha-ovs-syndic/init.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-syndic/init.yml
rename to classes/cluster_deprecated/os-ha-ovs-syndic/init.yml
diff --git a/classes/cluster/os-ha-ovs-syndic/openstack/compute.yml b/classes/cluster_deprecated/os-ha-ovs-syndic/openstack/compute.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-syndic/openstack/compute.yml
rename to classes/cluster_deprecated/os-ha-ovs-syndic/openstack/compute.yml
diff --git a/classes/cluster/os-ha-ovs-syndic/openstack/control.yml b/classes/cluster_deprecated/os-ha-ovs-syndic/openstack/control.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-syndic/openstack/control.yml
rename to classes/cluster_deprecated/os-ha-ovs-syndic/openstack/control.yml
diff --git a/classes/cluster/os-ha-ovs-syndic/openstack/dashboard.yml b/classes/cluster_deprecated/os-ha-ovs-syndic/openstack/dashboard.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-syndic/openstack/dashboard.yml
rename to classes/cluster_deprecated/os-ha-ovs-syndic/openstack/dashboard.yml
diff --git a/classes/cluster/os-ha-ovs-syndic/openstack/gateway.yml b/classes/cluster_deprecated/os-ha-ovs-syndic/openstack/gateway.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-syndic/openstack/gateway.yml
rename to classes/cluster_deprecated/os-ha-ovs-syndic/openstack/gateway.yml
diff --git a/classes/cluster/os-ha-ovs-syndic/openstack/init.yml b/classes/cluster_deprecated/os-ha-ovs-syndic/openstack/init.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-syndic/openstack/init.yml
rename to classes/cluster_deprecated/os-ha-ovs-syndic/openstack/init.yml
diff --git a/classes/cluster/os-ha-ovs-syndic/openstack/proxy.yml b/classes/cluster_deprecated/os-ha-ovs-syndic/openstack/proxy.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs-syndic/openstack/proxy.yml
rename to classes/cluster_deprecated/os-ha-ovs-syndic/openstack/proxy.yml
diff --git a/classes/cluster/os-ha-ovs/.env b/classes/cluster_deprecated/os-ha-ovs/.env
similarity index 100%
rename from classes/cluster/os-ha-ovs/.env
rename to classes/cluster_deprecated/os-ha-ovs/.env
diff --git a/classes/cluster/os-ha-ovs/infra/config.yml b/classes/cluster_deprecated/os-ha-ovs/infra/config.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs/infra/config.yml
rename to classes/cluster_deprecated/os-ha-ovs/infra/config.yml
diff --git a/classes/cluster/os-ha-ovs/infra/init.yml b/classes/cluster_deprecated/os-ha-ovs/infra/init.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs/infra/init.yml
rename to classes/cluster_deprecated/os-ha-ovs/infra/init.yml
diff --git a/classes/cluster/os-ha-ovs/init.yml b/classes/cluster_deprecated/os-ha-ovs/init.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs/init.yml
rename to classes/cluster_deprecated/os-ha-ovs/init.yml
diff --git a/classes/cluster/os-ha-ovs/openstack/compute.yml b/classes/cluster_deprecated/os-ha-ovs/openstack/compute.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs/openstack/compute.yml
rename to classes/cluster_deprecated/os-ha-ovs/openstack/compute.yml
diff --git a/classes/cluster/os-ha-ovs/openstack/control.yml b/classes/cluster_deprecated/os-ha-ovs/openstack/control.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs/openstack/control.yml
rename to classes/cluster_deprecated/os-ha-ovs/openstack/control.yml
diff --git a/classes/cluster/os-ha-ovs/openstack/dashboard.yml b/classes/cluster_deprecated/os-ha-ovs/openstack/dashboard.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs/openstack/dashboard.yml
rename to classes/cluster_deprecated/os-ha-ovs/openstack/dashboard.yml
diff --git a/classes/cluster/os-ha-ovs/openstack/gateway.yml b/classes/cluster_deprecated/os-ha-ovs/openstack/gateway.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs/openstack/gateway.yml
rename to classes/cluster_deprecated/os-ha-ovs/openstack/gateway.yml
diff --git a/classes/cluster/os-ha-ovs/openstack/init.yml b/classes/cluster_deprecated/os-ha-ovs/openstack/init.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs/openstack/init.yml
rename to classes/cluster_deprecated/os-ha-ovs/openstack/init.yml
diff --git a/classes/cluster/os-ha-ovs/openstack/proxy.yml b/classes/cluster_deprecated/os-ha-ovs/openstack/proxy.yml
similarity index 100%
rename from classes/cluster/os-ha-ovs/openstack/proxy.yml
rename to classes/cluster_deprecated/os-ha-ovs/openstack/proxy.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/.env b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/.env
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic-ssl/.env
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/.env
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/config.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/infra/config.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/config.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/infra/config.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/init.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/infra/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/init.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/infra/init.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/init.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic-ssl/init.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/init.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/baremetal.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/openstack/baremetal.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/baremetal.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/openstack/baremetal.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/compute.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/openstack/compute.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/compute.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/openstack/compute.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/control.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/openstack/control.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/control.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/openstack/control.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/dashboard.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/openstack/dashboard.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/dashboard.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/openstack/dashboard.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/gateway.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/openstack/gateway.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/gateway.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/openstack/gateway.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/init.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/openstack/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/init.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/openstack/init.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/proxy.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/openstack/proxy.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/proxy.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/openstack/proxy.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/stacklight/client.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/stacklight/client.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic-ssl/stacklight/client.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/stacklight/client.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/stacklight/init.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/stacklight/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic-ssl/stacklight/init.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/stacklight/init.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/stacklight/proxy.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/stacklight/proxy.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic-ssl/stacklight/proxy.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/stacklight/proxy.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/stacklight/server.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/stacklight/server.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic-ssl/stacklight/server.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic-ssl/stacklight/server.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/.env b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic/.env
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic/.env
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic/.env
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic/infra/config.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic/infra/config.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/infra/init.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic/infra/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic/infra/init.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic/infra/init.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/init.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic/init.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic/init.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/baremetal.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic/openstack/baremetal.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic/openstack/baremetal.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic/openstack/baremetal.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/compute.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic/openstack/compute.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic/openstack/compute.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic/openstack/compute.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic/openstack/control.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic/openstack/control.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/dashboard.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic/openstack/dashboard.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic/openstack/dashboard.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic/openstack/dashboard.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/gateway.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic/openstack/gateway.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic/openstack/gateway.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic/openstack/gateway.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/init.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic/openstack/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic/openstack/init.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic/openstack/init.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/proxy.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic/openstack/proxy.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic/openstack/proxy.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic/openstack/proxy.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/stacklight/client.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic/stacklight/client.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic/stacklight/client.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic/stacklight/client.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/stacklight/init.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic/stacklight/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic/stacklight/init.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic/stacklight/init.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/stacklight/proxy.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic/stacklight/proxy.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic/stacklight/proxy.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic/stacklight/proxy.yml
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/stacklight/server.yml b/classes/cluster_deprecated/virtual-mcp11-ovs-ironic/stacklight/server.yml
similarity index 100%
rename from classes/cluster/virtual-mcp11-ovs-ironic/stacklight/server.yml
rename to classes/cluster_deprecated/virtual-mcp11-ovs-ironic/stacklight/server.yml