From 3a1038e122349aa6599691a7e2c6bf167e93d744 Mon Sep 17 00:00:00 2001 From: Kaspars Skels Date: Mon, 27 Aug 2018 18:04:31 -0500 Subject: [PATCH] Remove folder-based versioning from manifests This adapts manifests to be in line of using git reference for refering to global/secrets repos instead of versioned folders. Change-Id: I0100fb90666e335bd99d304b3804c180b25a9d16 Depends-On: https://review.openstack.org/#/c/577886/ --- .../baremetal/bootactions/airship-target.yaml | 0 .../bootactions/apparmor-profiles.yaml | 0 .../baremetal/bootactions/promjoin.yaml | 0 .../deployment/deployment-strategy.yaml | 0 global/{common => }/layering-policy.yaml | 0 global/{v4.0 => }/profiles/genesis.yaml | 0 .../{v4.0 => }/profiles/hardware/generic.yaml | 0 global/{v4.0 => }/profiles/host/cp.yaml | 0 global/{v4.0 => }/profiles/host/dp.yaml | 0 .../{v4.0 => }/profiles/kubernetes-host.yaml | 0 .../profiles/security/apparmor_loader.yaml | 0 .../profiles/security/default_apparmor.yaml | 0 .../{v4.0 => }/schemas/armada/Chart/v1.yaml | 0 .../schemas/armada/ChartGroup/v1.yaml | 0 .../schemas/armada/Manifest/v1.yaml | 0 .../schemas/drydock/BaremetalNode/v1.yaml | 0 .../schemas/drydock/BootAction/v1.yaml | 0 .../schemas/drydock/HardwareProfile/v1.yaml | 0 .../schemas/drydock/HostProfile/v1.yaml | 0 .../schemas/drydock/Network/v1.yaml | 0 .../schemas/drydock/NetworkLink/v1.yaml | 0 .../{v4.0 => }/schemas/drydock/Rack/v1.yaml | 0 .../{v4.0 => }/schemas/drydock/Region/v1.yaml | 0 .../schemas/pegleg/AccountCatalogue/v1.yaml | 0 .../schemas/pegleg/AppArmorProfile/v1.yaml | 0 .../schemas/pegleg/CommonAddresses/v1.yaml | 0 .../pegleg/CommonSoftwareConfig/v1.yaml | 0 .../schemas/pegleg/EndpointCatalogue/v1.yaml | 0 .../schemas/pegleg/Script/v1.yaml | 0 .../schemas/pegleg/SiteDefinition/v1.yaml | 20 ++++++++++++++----- .../schemas/pegleg/SoftwareVersions/v1.yaml | 0 .../schemas/promenade/Docker/v1.yaml | 0 .../schemas/promenade/Genesis/v1.yaml | 0 .../schemas/promenade/HostSystem/v1.yaml | 0 .../schemas/promenade/Kubelet/v1.yaml | 0 .../promenade/KubernetesNetwork/v1.yaml | 0 .../schemas/promenade/KubernetesNode/v1.yaml | 0 .../promenade/PKICatalog/PKICatalog.yaml | 0 .../shipyard/DeploymentConfiguration/v1.yaml | 0 .../shipyard/DeploymentStrategy/v1.yaml | 0 .../scripts/configure-ip-rules.yaml | 0 .../passphrases/private_docker_key.yaml | 0 .../publickey/airship_ssh_public_key.yaml | 0 .../container-networking/calico.yaml | 0 .../container-networking/chart-group.yaml | 0 .../kubernetes/container-networking/etcd.yaml | 0 .../charts/kubernetes/core/apiserver.yaml | 0 .../charts/kubernetes/core/chart-group.yaml | 0 .../kubernetes/core/controller-manager.yaml | 0 .../charts/kubernetes/core/scheduler.yaml | 0 .../charts/kubernetes/dns/chart-group.yaml | 0 .../charts/kubernetes/dns/coredns.yaml | 0 .../charts/kubernetes/etcd/chart-group.yaml | 0 .../software/charts/kubernetes/etcd/etcd.yaml | 0 .../kubernetes/haproxy/chart-group.yaml | 0 .../charts/kubernetes/haproxy/haproxy.yaml | 0 .../kubernetes/ingress/chart-group.yaml | 0 .../charts/kubernetes/ingress/ingress.yaml | 0 .../charts/kubernetes/proxy/chart-group.yaml | 0 .../kubernetes/proxy/kubernetes-proxy.yaml | 0 .../charts/osh-infra/dependencies.yaml | 0 .../osh-infra-ceph-config/ceph-config.yaml | 0 .../osh-infra-ceph-config/chart-group.yaml | 0 .../osh-infra-dashboards/chart-group.yaml | 0 .../osh-infra-dashboards/grafana.yaml | 0 .../osh-infra-dashboards/kibana.yaml | 0 .../chart-group.yaml | 0 .../osh-infra-ingress-controller/ingress.yaml | 0 .../osh-infra-logging/chart-group.yaml | 0 .../osh-infra-logging/elasticsearch.yaml | 0 .../osh-infra-logging/fluent-logging.yaml | 0 .../osh-infra-mariadb/chart-group.yaml | 0 .../osh-infra/osh-infra-mariadb/mariadb.yaml | 0 .../osh-infra-monitoring/chart-group.yaml | 0 .../osh-infra-monitoring/nagios.yaml | 0 .../prometheus-alertmanager.yaml | 0 .../prometheus-kube-state-metrics.yaml | 0 .../prometheus-node-exporter.yaml | 0 .../osh-infra-monitoring/prometheus.yaml | 0 .../chart-group.yaml | 0 .../prometheus-openstack-exporter.yaml | 0 .../software/charts/osh/dependencies.yaml | 0 .../openstack-ceph-config/ceph-config.yaml | 0 .../openstack-ceph-config/chart-group.yaml | 0 .../osh/openstack-cinder/chart-group.yaml | 0 .../charts/osh/openstack-cinder/cinder.yaml | 0 .../charts/osh/openstack-cinder/rabbitmq.yaml | 0 .../openstack-compute-kit/chart-group.yaml | 0 .../osh/openstack-compute-kit/libvirt.yaml | 0 .../neutron-rabbitmq.yaml | 0 .../osh/openstack-compute-kit/neutron.yaml | 0 .../openstack-compute-kit/nova-rabbitmq.yaml | 0 .../osh/openstack-compute-kit/nova.yaml | 0 .../openstack-compute-kit/openvswitch.yaml | 0 .../osh/openstack-glance/chart-group.yaml | 0 .../charts/osh/openstack-glance/glance.yaml | 0 .../charts/osh/openstack-glance/rabbitmq.yaml | 0 .../osh/openstack-heat/chart-group.yaml | 0 .../charts/osh/openstack-heat/heat.yaml | 0 .../charts/osh/openstack-heat/rabbitmq.yaml | 0 .../osh/openstack-horizon/chart-group.yaml | 0 .../charts/osh/openstack-horizon/horizon.yaml | 0 .../chart-group.yaml | 0 .../openstack-ingress-controller/ingress.yaml | 0 .../osh/openstack-keystone/chart-group.yaml | 0 .../osh/openstack-keystone/keystone.yaml | 0 .../osh/openstack-keystone/rabbitmq.yaml | 0 .../osh/openstack-mariadb/chart-group.yaml | 0 .../charts/osh/openstack-mariadb/mariadb.yaml | 0 .../osh/openstack-memcached/chart-group.yaml | 0 .../osh/openstack-memcached/memcached.yaml | 0 .../osh/openstack-radosgw/chart-group.yaml | 0 .../charts/osh/openstack-radosgw/radosgw.yaml | 0 .../software/charts/ucp/armada/armada.yaml | 0 .../charts/ucp/armada/chart-group.yaml | 0 .../software/charts/ucp/armada/tiller.yaml | 0 .../charts/ucp/ceph-config/ceph-config.yaml | 0 .../charts/ucp/ceph-config/chart-group.yaml | 0 .../charts/ucp/ceph/ceph-client-update.yaml | 0 .../software/charts/ucp/ceph/ceph-client.yaml | 0 .../software/charts/ucp/ceph/ceph-htk.yaml | 0 .../charts/ucp/ceph/ceph-ingress.yaml | 0 .../software/charts/ucp/ceph/ceph-mon.yaml | 0 .../software/charts/ucp/ceph/ceph-osd.yaml | 0 .../charts/ucp/ceph/ceph-provisioners.yaml | 0 .../software/charts/ucp/ceph/ceph-rgw.yaml | 0 .../charts/ucp/ceph/chart-group-update.yaml | 0 .../software/charts/ucp/ceph/chart-group.yaml | 0 .../software/charts/ucp/core/chart-group.yaml | 0 .../software/charts/ucp/core/ingress.yaml | 0 .../software/charts/ucp/core/mariadb.yaml | 0 .../software/charts/ucp/core/postgresql.yaml | 0 .../software/charts/ucp/core/rabbitmq.yaml | 0 .../charts/ucp/deckhand/barbican.yaml | 0 .../charts/ucp/deckhand/chart-group.yaml | 0 .../charts/ucp/deckhand/deckhand.yaml | 0 .../charts/ucp/divingbell/chart-group.yaml | 0 .../charts/ucp/divingbell/divingbell.yaml | 0 .../charts/ucp/drydock/chart-group.yaml | 0 .../software/charts/ucp/drydock/drydock.yaml | 0 .../software/charts/ucp/drydock/maas.yaml | 0 .../charts/ucp/keystone/chart-group.yaml | 0 .../charts/ucp/keystone/keystone.yaml | 0 .../charts/ucp/keystone/memcached.yaml | 0 .../charts/ucp/promenade/chart-group.yaml | 0 .../charts/ucp/promenade/promenade.yaml | 0 .../charts/ucp/shipyard/chart-group.yaml | 0 .../charts/ucp/shipyard/shipyard.yaml | 0 global/{v4.0 => }/software/config/Docker.yaml | 0 .../{v4.0 => }/software/config/Kubelet.yaml | 0 .../{v4.0 => }/software/config/versions.yaml | 0 .../software/manifests/bootstrap.yaml | 0 .../software/manifests/full-site.yaml | 0 .../{v4.0 => }/network/KubernetesNetwork.yaml | 0 154 files changed, 15 insertions(+), 5 deletions(-) rename global/{v4.0 => }/baremetal/bootactions/airship-target.yaml (100%) rename global/{v4.0 => }/baremetal/bootactions/apparmor-profiles.yaml (100%) rename global/{v4.0 => }/baremetal/bootactions/promjoin.yaml (100%) rename global/{v4.0 => }/deployment/deployment-strategy.yaml (100%) rename global/{common => }/layering-policy.yaml (100%) rename global/{v4.0 => }/profiles/genesis.yaml (100%) rename global/{v4.0 => }/profiles/hardware/generic.yaml (100%) rename global/{v4.0 => }/profiles/host/cp.yaml (100%) rename global/{v4.0 => }/profiles/host/dp.yaml (100%) rename global/{v4.0 => }/profiles/kubernetes-host.yaml (100%) rename global/{v4.0 => }/profiles/security/apparmor_loader.yaml (100%) rename global/{v4.0 => }/profiles/security/default_apparmor.yaml (100%) rename global/{v4.0 => }/schemas/armada/Chart/v1.yaml (100%) rename global/{v4.0 => }/schemas/armada/ChartGroup/v1.yaml (100%) rename global/{v4.0 => }/schemas/armada/Manifest/v1.yaml (100%) rename global/{v4.0 => }/schemas/drydock/BaremetalNode/v1.yaml (100%) rename global/{v4.0 => }/schemas/drydock/BootAction/v1.yaml (100%) rename global/{v4.0 => }/schemas/drydock/HardwareProfile/v1.yaml (100%) rename global/{v4.0 => }/schemas/drydock/HostProfile/v1.yaml (100%) rename global/{v4.0 => }/schemas/drydock/Network/v1.yaml (100%) rename global/{v4.0 => }/schemas/drydock/NetworkLink/v1.yaml (100%) rename global/{v4.0 => }/schemas/drydock/Rack/v1.yaml (100%) rename global/{v4.0 => }/schemas/drydock/Region/v1.yaml (100%) rename global/{v4.0 => }/schemas/pegleg/AccountCatalogue/v1.yaml (100%) rename global/{v4.0 => }/schemas/pegleg/AppArmorProfile/v1.yaml (100%) rename global/{v4.0 => }/schemas/pegleg/CommonAddresses/v1.yaml (100%) rename global/{v4.0 => }/schemas/pegleg/CommonSoftwareConfig/v1.yaml (100%) rename global/{v4.0 => }/schemas/pegleg/EndpointCatalogue/v1.yaml (100%) rename global/{common => }/schemas/pegleg/Script/v1.yaml (100%) rename global/{common => }/schemas/pegleg/SiteDefinition/v1.yaml (52%) rename global/{v4.0 => }/schemas/pegleg/SoftwareVersions/v1.yaml (100%) rename global/{v4.0 => }/schemas/promenade/Docker/v1.yaml (100%) rename global/{v4.0 => }/schemas/promenade/Genesis/v1.yaml (100%) rename global/{v4.0 => }/schemas/promenade/HostSystem/v1.yaml (100%) rename global/{v4.0 => }/schemas/promenade/Kubelet/v1.yaml (100%) rename global/{v4.0 => }/schemas/promenade/KubernetesNetwork/v1.yaml (100%) rename global/{v4.0 => }/schemas/promenade/KubernetesNode/v1.yaml (100%) rename global/{v4.0 => }/schemas/promenade/PKICatalog/PKICatalog.yaml (100%) rename global/{v4.0 => }/schemas/shipyard/DeploymentConfiguration/v1.yaml (100%) rename global/{v4.0 => }/schemas/shipyard/DeploymentStrategy/v1.yaml (100%) rename global/{v4.0 => }/scripts/configure-ip-rules.yaml (100%) rename global/{common => }/secrets/passphrases/private_docker_key.yaml (100%) rename global/{common => }/secrets/publickey/airship_ssh_public_key.yaml (100%) rename global/{v4.0 => }/software/charts/kubernetes/container-networking/calico.yaml (100%) rename global/{v4.0 => }/software/charts/kubernetes/container-networking/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/kubernetes/container-networking/etcd.yaml (100%) rename global/{v4.0 => }/software/charts/kubernetes/core/apiserver.yaml (100%) rename global/{v4.0 => }/software/charts/kubernetes/core/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/kubernetes/core/controller-manager.yaml (100%) rename global/{v4.0 => }/software/charts/kubernetes/core/scheduler.yaml (100%) rename global/{v4.0 => }/software/charts/kubernetes/dns/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/kubernetes/dns/coredns.yaml (100%) rename global/{v4.0 => }/software/charts/kubernetes/etcd/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/kubernetes/etcd/etcd.yaml (100%) rename global/{v4.0 => }/software/charts/kubernetes/haproxy/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/kubernetes/haproxy/haproxy.yaml (100%) rename global/{v4.0 => }/software/charts/kubernetes/ingress/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/kubernetes/ingress/ingress.yaml (100%) rename global/{v4.0 => }/software/charts/kubernetes/proxy/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/kubernetes/proxy/kubernetes-proxy.yaml (100%) rename global/{v4.0 => }/software/charts/osh-infra/dependencies.yaml (100%) rename global/{v4.0 => }/software/charts/osh-infra/osh-infra-ceph-config/ceph-config.yaml (100%) rename global/{v4.0 => }/software/charts/osh-infra/osh-infra-ceph-config/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/osh-infra/osh-infra-dashboards/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/osh-infra/osh-infra-dashboards/grafana.yaml (100%) rename global/{v4.0 => }/software/charts/osh-infra/osh-infra-dashboards/kibana.yaml (100%) rename global/{v4.0 => }/software/charts/osh-infra/osh-infra-ingress-controller/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/osh-infra/osh-infra-ingress-controller/ingress.yaml (100%) rename global/{v4.0 => }/software/charts/osh-infra/osh-infra-logging/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml (100%) rename global/{v4.0 => }/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml (100%) rename global/{v4.0 => }/software/charts/osh-infra/osh-infra-mariadb/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml (100%) rename global/{v4.0 => }/software/charts/osh-infra/osh-infra-monitoring/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/osh-infra/osh-infra-monitoring/nagios.yaml (100%) rename global/{v4.0 => }/software/charts/osh-infra/osh-infra-monitoring/prometheus-alertmanager.yaml (100%) rename global/{v4.0 => }/software/charts/osh-infra/osh-infra-monitoring/prometheus-kube-state-metrics.yaml (100%) rename global/{v4.0 => }/software/charts/osh-infra/osh-infra-monitoring/prometheus-node-exporter.yaml (100%) rename global/{v4.0 => }/software/charts/osh-infra/osh-infra-monitoring/prometheus.yaml (100%) rename global/{v4.0 => }/software/charts/osh-infra/osh-infra-openstack-exporter/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/osh-infra/osh-infra-openstack-exporter/prometheus-openstack-exporter.yaml (100%) rename global/{v4.0 => }/software/charts/osh/dependencies.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-ceph-config/ceph-config.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-ceph-config/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-cinder/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-cinder/cinder.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-cinder/rabbitmq.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-compute-kit/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-compute-kit/libvirt.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-compute-kit/neutron.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-compute-kit/nova.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-compute-kit/openvswitch.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-glance/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-glance/glance.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-glance/rabbitmq.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-heat/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-heat/heat.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-heat/rabbitmq.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-horizon/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-horizon/horizon.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-ingress-controller/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-ingress-controller/ingress.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-keystone/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-keystone/keystone.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-keystone/rabbitmq.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-mariadb/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-mariadb/mariadb.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-memcached/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-memcached/memcached.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-radosgw/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/osh/openstack-radosgw/radosgw.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/armada/armada.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/armada/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/armada/tiller.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/ceph-config/ceph-config.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/ceph-config/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/ceph/ceph-client-update.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/ceph/ceph-client.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/ceph/ceph-htk.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/ceph/ceph-ingress.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/ceph/ceph-mon.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/ceph/ceph-osd.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/ceph/ceph-provisioners.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/ceph/ceph-rgw.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/ceph/chart-group-update.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/ceph/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/core/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/core/ingress.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/core/mariadb.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/core/postgresql.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/core/rabbitmq.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/deckhand/barbican.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/deckhand/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/deckhand/deckhand.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/divingbell/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/divingbell/divingbell.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/drydock/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/drydock/drydock.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/drydock/maas.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/keystone/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/keystone/keystone.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/keystone/memcached.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/promenade/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/promenade/promenade.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/shipyard/chart-group.yaml (100%) rename global/{v4.0 => }/software/charts/ucp/shipyard/shipyard.yaml (100%) rename global/{v4.0 => }/software/config/Docker.yaml (100%) rename global/{v4.0 => }/software/config/Kubelet.yaml (100%) rename global/{v4.0 => }/software/config/versions.yaml (100%) rename global/{v4.0 => }/software/manifests/bootstrap.yaml (100%) rename global/{v4.0 => }/software/manifests/full-site.yaml (100%) rename type/foundry/{v4.0 => }/network/KubernetesNetwork.yaml (100%) diff --git a/global/v4.0/baremetal/bootactions/airship-target.yaml b/global/baremetal/bootactions/airship-target.yaml similarity index 100% rename from global/v4.0/baremetal/bootactions/airship-target.yaml rename to global/baremetal/bootactions/airship-target.yaml diff --git a/global/v4.0/baremetal/bootactions/apparmor-profiles.yaml b/global/baremetal/bootactions/apparmor-profiles.yaml similarity index 100% rename from global/v4.0/baremetal/bootactions/apparmor-profiles.yaml rename to global/baremetal/bootactions/apparmor-profiles.yaml diff --git a/global/v4.0/baremetal/bootactions/promjoin.yaml b/global/baremetal/bootactions/promjoin.yaml similarity index 100% rename from global/v4.0/baremetal/bootactions/promjoin.yaml rename to global/baremetal/bootactions/promjoin.yaml diff --git a/global/v4.0/deployment/deployment-strategy.yaml b/global/deployment/deployment-strategy.yaml similarity index 100% rename from global/v4.0/deployment/deployment-strategy.yaml rename to global/deployment/deployment-strategy.yaml diff --git a/global/common/layering-policy.yaml b/global/layering-policy.yaml similarity index 100% rename from global/common/layering-policy.yaml rename to global/layering-policy.yaml diff --git a/global/v4.0/profiles/genesis.yaml b/global/profiles/genesis.yaml similarity index 100% rename from global/v4.0/profiles/genesis.yaml rename to global/profiles/genesis.yaml diff --git a/global/v4.0/profiles/hardware/generic.yaml b/global/profiles/hardware/generic.yaml similarity index 100% rename from global/v4.0/profiles/hardware/generic.yaml rename to global/profiles/hardware/generic.yaml diff --git a/global/v4.0/profiles/host/cp.yaml b/global/profiles/host/cp.yaml similarity index 100% rename from global/v4.0/profiles/host/cp.yaml rename to global/profiles/host/cp.yaml diff --git a/global/v4.0/profiles/host/dp.yaml b/global/profiles/host/dp.yaml similarity index 100% rename from global/v4.0/profiles/host/dp.yaml rename to global/profiles/host/dp.yaml diff --git a/global/v4.0/profiles/kubernetes-host.yaml b/global/profiles/kubernetes-host.yaml similarity index 100% rename from global/v4.0/profiles/kubernetes-host.yaml rename to global/profiles/kubernetes-host.yaml diff --git a/global/v4.0/profiles/security/apparmor_loader.yaml b/global/profiles/security/apparmor_loader.yaml similarity index 100% rename from global/v4.0/profiles/security/apparmor_loader.yaml rename to global/profiles/security/apparmor_loader.yaml diff --git a/global/v4.0/profiles/security/default_apparmor.yaml b/global/profiles/security/default_apparmor.yaml similarity index 100% rename from global/v4.0/profiles/security/default_apparmor.yaml rename to global/profiles/security/default_apparmor.yaml diff --git a/global/v4.0/schemas/armada/Chart/v1.yaml b/global/schemas/armada/Chart/v1.yaml similarity index 100% rename from global/v4.0/schemas/armada/Chart/v1.yaml rename to global/schemas/armada/Chart/v1.yaml diff --git a/global/v4.0/schemas/armada/ChartGroup/v1.yaml b/global/schemas/armada/ChartGroup/v1.yaml similarity index 100% rename from global/v4.0/schemas/armada/ChartGroup/v1.yaml rename to global/schemas/armada/ChartGroup/v1.yaml diff --git a/global/v4.0/schemas/armada/Manifest/v1.yaml b/global/schemas/armada/Manifest/v1.yaml similarity index 100% rename from global/v4.0/schemas/armada/Manifest/v1.yaml rename to global/schemas/armada/Manifest/v1.yaml diff --git a/global/v4.0/schemas/drydock/BaremetalNode/v1.yaml b/global/schemas/drydock/BaremetalNode/v1.yaml similarity index 100% rename from global/v4.0/schemas/drydock/BaremetalNode/v1.yaml rename to global/schemas/drydock/BaremetalNode/v1.yaml diff --git a/global/v4.0/schemas/drydock/BootAction/v1.yaml b/global/schemas/drydock/BootAction/v1.yaml similarity index 100% rename from global/v4.0/schemas/drydock/BootAction/v1.yaml rename to global/schemas/drydock/BootAction/v1.yaml diff --git a/global/v4.0/schemas/drydock/HardwareProfile/v1.yaml b/global/schemas/drydock/HardwareProfile/v1.yaml similarity index 100% rename from global/v4.0/schemas/drydock/HardwareProfile/v1.yaml rename to global/schemas/drydock/HardwareProfile/v1.yaml diff --git a/global/v4.0/schemas/drydock/HostProfile/v1.yaml b/global/schemas/drydock/HostProfile/v1.yaml similarity index 100% rename from global/v4.0/schemas/drydock/HostProfile/v1.yaml rename to global/schemas/drydock/HostProfile/v1.yaml diff --git a/global/v4.0/schemas/drydock/Network/v1.yaml b/global/schemas/drydock/Network/v1.yaml similarity index 100% rename from global/v4.0/schemas/drydock/Network/v1.yaml rename to global/schemas/drydock/Network/v1.yaml diff --git a/global/v4.0/schemas/drydock/NetworkLink/v1.yaml b/global/schemas/drydock/NetworkLink/v1.yaml similarity index 100% rename from global/v4.0/schemas/drydock/NetworkLink/v1.yaml rename to global/schemas/drydock/NetworkLink/v1.yaml diff --git a/global/v4.0/schemas/drydock/Rack/v1.yaml b/global/schemas/drydock/Rack/v1.yaml similarity index 100% rename from global/v4.0/schemas/drydock/Rack/v1.yaml rename to global/schemas/drydock/Rack/v1.yaml diff --git a/global/v4.0/schemas/drydock/Region/v1.yaml b/global/schemas/drydock/Region/v1.yaml similarity index 100% rename from global/v4.0/schemas/drydock/Region/v1.yaml rename to global/schemas/drydock/Region/v1.yaml diff --git a/global/v4.0/schemas/pegleg/AccountCatalogue/v1.yaml b/global/schemas/pegleg/AccountCatalogue/v1.yaml similarity index 100% rename from global/v4.0/schemas/pegleg/AccountCatalogue/v1.yaml rename to global/schemas/pegleg/AccountCatalogue/v1.yaml diff --git a/global/v4.0/schemas/pegleg/AppArmorProfile/v1.yaml b/global/schemas/pegleg/AppArmorProfile/v1.yaml similarity index 100% rename from global/v4.0/schemas/pegleg/AppArmorProfile/v1.yaml rename to global/schemas/pegleg/AppArmorProfile/v1.yaml diff --git a/global/v4.0/schemas/pegleg/CommonAddresses/v1.yaml b/global/schemas/pegleg/CommonAddresses/v1.yaml similarity index 100% rename from global/v4.0/schemas/pegleg/CommonAddresses/v1.yaml rename to global/schemas/pegleg/CommonAddresses/v1.yaml diff --git a/global/v4.0/schemas/pegleg/CommonSoftwareConfig/v1.yaml b/global/schemas/pegleg/CommonSoftwareConfig/v1.yaml similarity index 100% rename from global/v4.0/schemas/pegleg/CommonSoftwareConfig/v1.yaml rename to global/schemas/pegleg/CommonSoftwareConfig/v1.yaml diff --git a/global/v4.0/schemas/pegleg/EndpointCatalogue/v1.yaml b/global/schemas/pegleg/EndpointCatalogue/v1.yaml similarity index 100% rename from global/v4.0/schemas/pegleg/EndpointCatalogue/v1.yaml rename to global/schemas/pegleg/EndpointCatalogue/v1.yaml diff --git a/global/common/schemas/pegleg/Script/v1.yaml b/global/schemas/pegleg/Script/v1.yaml similarity index 100% rename from global/common/schemas/pegleg/Script/v1.yaml rename to global/schemas/pegleg/Script/v1.yaml diff --git a/global/common/schemas/pegleg/SiteDefinition/v1.yaml b/global/schemas/pegleg/SiteDefinition/v1.yaml similarity index 52% rename from global/common/schemas/pegleg/SiteDefinition/v1.yaml rename to global/schemas/pegleg/SiteDefinition/v1.yaml index 3878eb3bf..80e6b69bb 100644 --- a/global/common/schemas/pegleg/SiteDefinition/v1.yaml +++ b/global/schemas/pegleg/SiteDefinition/v1.yaml @@ -5,15 +5,25 @@ metadata: name: pegleg/SiteDefinition/v1 data: $schema: http://json-schema.org/schema# - type: object + type: object properties: - revision: - type: string - pattern: '^v.+$' + repositories: + type: object + additionalProperties: + type: object + properties: + revision: + type: string + url: + type: string + required: + - revision + - url + site_type: type: string required: - - revision - site_type additionalProperties: false +... diff --git a/global/v4.0/schemas/pegleg/SoftwareVersions/v1.yaml b/global/schemas/pegleg/SoftwareVersions/v1.yaml similarity index 100% rename from global/v4.0/schemas/pegleg/SoftwareVersions/v1.yaml rename to global/schemas/pegleg/SoftwareVersions/v1.yaml diff --git a/global/v4.0/schemas/promenade/Docker/v1.yaml b/global/schemas/promenade/Docker/v1.yaml similarity index 100% rename from global/v4.0/schemas/promenade/Docker/v1.yaml rename to global/schemas/promenade/Docker/v1.yaml diff --git a/global/v4.0/schemas/promenade/Genesis/v1.yaml b/global/schemas/promenade/Genesis/v1.yaml similarity index 100% rename from global/v4.0/schemas/promenade/Genesis/v1.yaml rename to global/schemas/promenade/Genesis/v1.yaml diff --git a/global/v4.0/schemas/promenade/HostSystem/v1.yaml b/global/schemas/promenade/HostSystem/v1.yaml similarity index 100% rename from global/v4.0/schemas/promenade/HostSystem/v1.yaml rename to global/schemas/promenade/HostSystem/v1.yaml diff --git a/global/v4.0/schemas/promenade/Kubelet/v1.yaml b/global/schemas/promenade/Kubelet/v1.yaml similarity index 100% rename from global/v4.0/schemas/promenade/Kubelet/v1.yaml rename to global/schemas/promenade/Kubelet/v1.yaml diff --git a/global/v4.0/schemas/promenade/KubernetesNetwork/v1.yaml b/global/schemas/promenade/KubernetesNetwork/v1.yaml similarity index 100% rename from global/v4.0/schemas/promenade/KubernetesNetwork/v1.yaml rename to global/schemas/promenade/KubernetesNetwork/v1.yaml diff --git a/global/v4.0/schemas/promenade/KubernetesNode/v1.yaml b/global/schemas/promenade/KubernetesNode/v1.yaml similarity index 100% rename from global/v4.0/schemas/promenade/KubernetesNode/v1.yaml rename to global/schemas/promenade/KubernetesNode/v1.yaml diff --git a/global/v4.0/schemas/promenade/PKICatalog/PKICatalog.yaml b/global/schemas/promenade/PKICatalog/PKICatalog.yaml similarity index 100% rename from global/v4.0/schemas/promenade/PKICatalog/PKICatalog.yaml rename to global/schemas/promenade/PKICatalog/PKICatalog.yaml diff --git a/global/v4.0/schemas/shipyard/DeploymentConfiguration/v1.yaml b/global/schemas/shipyard/DeploymentConfiguration/v1.yaml similarity index 100% rename from global/v4.0/schemas/shipyard/DeploymentConfiguration/v1.yaml rename to global/schemas/shipyard/DeploymentConfiguration/v1.yaml diff --git a/global/v4.0/schemas/shipyard/DeploymentStrategy/v1.yaml b/global/schemas/shipyard/DeploymentStrategy/v1.yaml similarity index 100% rename from global/v4.0/schemas/shipyard/DeploymentStrategy/v1.yaml rename to global/schemas/shipyard/DeploymentStrategy/v1.yaml diff --git a/global/v4.0/scripts/configure-ip-rules.yaml b/global/scripts/configure-ip-rules.yaml similarity index 100% rename from global/v4.0/scripts/configure-ip-rules.yaml rename to global/scripts/configure-ip-rules.yaml diff --git a/global/common/secrets/passphrases/private_docker_key.yaml b/global/secrets/passphrases/private_docker_key.yaml similarity index 100% rename from global/common/secrets/passphrases/private_docker_key.yaml rename to global/secrets/passphrases/private_docker_key.yaml diff --git a/global/common/secrets/publickey/airship_ssh_public_key.yaml b/global/secrets/publickey/airship_ssh_public_key.yaml similarity index 100% rename from global/common/secrets/publickey/airship_ssh_public_key.yaml rename to global/secrets/publickey/airship_ssh_public_key.yaml diff --git a/global/v4.0/software/charts/kubernetes/container-networking/calico.yaml b/global/software/charts/kubernetes/container-networking/calico.yaml similarity index 100% rename from global/v4.0/software/charts/kubernetes/container-networking/calico.yaml rename to global/software/charts/kubernetes/container-networking/calico.yaml diff --git a/global/v4.0/software/charts/kubernetes/container-networking/chart-group.yaml b/global/software/charts/kubernetes/container-networking/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/kubernetes/container-networking/chart-group.yaml rename to global/software/charts/kubernetes/container-networking/chart-group.yaml diff --git a/global/v4.0/software/charts/kubernetes/container-networking/etcd.yaml b/global/software/charts/kubernetes/container-networking/etcd.yaml similarity index 100% rename from global/v4.0/software/charts/kubernetes/container-networking/etcd.yaml rename to global/software/charts/kubernetes/container-networking/etcd.yaml diff --git a/global/v4.0/software/charts/kubernetes/core/apiserver.yaml b/global/software/charts/kubernetes/core/apiserver.yaml similarity index 100% rename from global/v4.0/software/charts/kubernetes/core/apiserver.yaml rename to global/software/charts/kubernetes/core/apiserver.yaml diff --git a/global/v4.0/software/charts/kubernetes/core/chart-group.yaml b/global/software/charts/kubernetes/core/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/kubernetes/core/chart-group.yaml rename to global/software/charts/kubernetes/core/chart-group.yaml diff --git a/global/v4.0/software/charts/kubernetes/core/controller-manager.yaml b/global/software/charts/kubernetes/core/controller-manager.yaml similarity index 100% rename from global/v4.0/software/charts/kubernetes/core/controller-manager.yaml rename to global/software/charts/kubernetes/core/controller-manager.yaml diff --git a/global/v4.0/software/charts/kubernetes/core/scheduler.yaml b/global/software/charts/kubernetes/core/scheduler.yaml similarity index 100% rename from global/v4.0/software/charts/kubernetes/core/scheduler.yaml rename to global/software/charts/kubernetes/core/scheduler.yaml diff --git a/global/v4.0/software/charts/kubernetes/dns/chart-group.yaml b/global/software/charts/kubernetes/dns/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/kubernetes/dns/chart-group.yaml rename to global/software/charts/kubernetes/dns/chart-group.yaml diff --git a/global/v4.0/software/charts/kubernetes/dns/coredns.yaml b/global/software/charts/kubernetes/dns/coredns.yaml similarity index 100% rename from global/v4.0/software/charts/kubernetes/dns/coredns.yaml rename to global/software/charts/kubernetes/dns/coredns.yaml diff --git a/global/v4.0/software/charts/kubernetes/etcd/chart-group.yaml b/global/software/charts/kubernetes/etcd/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/kubernetes/etcd/chart-group.yaml rename to global/software/charts/kubernetes/etcd/chart-group.yaml diff --git a/global/v4.0/software/charts/kubernetes/etcd/etcd.yaml b/global/software/charts/kubernetes/etcd/etcd.yaml similarity index 100% rename from global/v4.0/software/charts/kubernetes/etcd/etcd.yaml rename to global/software/charts/kubernetes/etcd/etcd.yaml diff --git a/global/v4.0/software/charts/kubernetes/haproxy/chart-group.yaml b/global/software/charts/kubernetes/haproxy/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/kubernetes/haproxy/chart-group.yaml rename to global/software/charts/kubernetes/haproxy/chart-group.yaml diff --git a/global/v4.0/software/charts/kubernetes/haproxy/haproxy.yaml b/global/software/charts/kubernetes/haproxy/haproxy.yaml similarity index 100% rename from global/v4.0/software/charts/kubernetes/haproxy/haproxy.yaml rename to global/software/charts/kubernetes/haproxy/haproxy.yaml diff --git a/global/v4.0/software/charts/kubernetes/ingress/chart-group.yaml b/global/software/charts/kubernetes/ingress/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/kubernetes/ingress/chart-group.yaml rename to global/software/charts/kubernetes/ingress/chart-group.yaml diff --git a/global/v4.0/software/charts/kubernetes/ingress/ingress.yaml b/global/software/charts/kubernetes/ingress/ingress.yaml similarity index 100% rename from global/v4.0/software/charts/kubernetes/ingress/ingress.yaml rename to global/software/charts/kubernetes/ingress/ingress.yaml diff --git a/global/v4.0/software/charts/kubernetes/proxy/chart-group.yaml b/global/software/charts/kubernetes/proxy/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/kubernetes/proxy/chart-group.yaml rename to global/software/charts/kubernetes/proxy/chart-group.yaml diff --git a/global/v4.0/software/charts/kubernetes/proxy/kubernetes-proxy.yaml b/global/software/charts/kubernetes/proxy/kubernetes-proxy.yaml similarity index 100% rename from global/v4.0/software/charts/kubernetes/proxy/kubernetes-proxy.yaml rename to global/software/charts/kubernetes/proxy/kubernetes-proxy.yaml diff --git a/global/v4.0/software/charts/osh-infra/dependencies.yaml b/global/software/charts/osh-infra/dependencies.yaml similarity index 100% rename from global/v4.0/software/charts/osh-infra/dependencies.yaml rename to global/software/charts/osh-infra/dependencies.yaml diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-ceph-config/ceph-config.yaml b/global/software/charts/osh-infra/osh-infra-ceph-config/ceph-config.yaml similarity index 100% rename from global/v4.0/software/charts/osh-infra/osh-infra-ceph-config/ceph-config.yaml rename to global/software/charts/osh-infra/osh-infra-ceph-config/ceph-config.yaml diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-ceph-config/chart-group.yaml b/global/software/charts/osh-infra/osh-infra-ceph-config/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/osh-infra/osh-infra-ceph-config/chart-group.yaml rename to global/software/charts/osh-infra/osh-infra-ceph-config/chart-group.yaml diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-dashboards/chart-group.yaml b/global/software/charts/osh-infra/osh-infra-dashboards/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/osh-infra/osh-infra-dashboards/chart-group.yaml rename to global/software/charts/osh-infra/osh-infra-dashboards/chart-group.yaml diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-dashboards/grafana.yaml b/global/software/charts/osh-infra/osh-infra-dashboards/grafana.yaml similarity index 100% rename from global/v4.0/software/charts/osh-infra/osh-infra-dashboards/grafana.yaml rename to global/software/charts/osh-infra/osh-infra-dashboards/grafana.yaml diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-dashboards/kibana.yaml b/global/software/charts/osh-infra/osh-infra-dashboards/kibana.yaml similarity index 100% rename from global/v4.0/software/charts/osh-infra/osh-infra-dashboards/kibana.yaml rename to global/software/charts/osh-infra/osh-infra-dashboards/kibana.yaml diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-ingress-controller/chart-group.yaml b/global/software/charts/osh-infra/osh-infra-ingress-controller/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/osh-infra/osh-infra-ingress-controller/chart-group.yaml rename to global/software/charts/osh-infra/osh-infra-ingress-controller/chart-group.yaml diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-ingress-controller/ingress.yaml b/global/software/charts/osh-infra/osh-infra-ingress-controller/ingress.yaml similarity index 100% rename from global/v4.0/software/charts/osh-infra/osh-infra-ingress-controller/ingress.yaml rename to global/software/charts/osh-infra/osh-infra-ingress-controller/ingress.yaml diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-logging/chart-group.yaml b/global/software/charts/osh-infra/osh-infra-logging/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/osh-infra/osh-infra-logging/chart-group.yaml rename to global/software/charts/osh-infra/osh-infra-logging/chart-group.yaml diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml b/global/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml similarity index 100% rename from global/v4.0/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml rename to global/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml b/global/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml similarity index 100% rename from global/v4.0/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml rename to global/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-mariadb/chart-group.yaml b/global/software/charts/osh-infra/osh-infra-mariadb/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/osh-infra/osh-infra-mariadb/chart-group.yaml rename to global/software/charts/osh-infra/osh-infra-mariadb/chart-group.yaml diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml b/global/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml similarity index 100% rename from global/v4.0/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml rename to global/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/chart-group.yaml b/global/software/charts/osh-infra/osh-infra-monitoring/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/osh-infra/osh-infra-monitoring/chart-group.yaml rename to global/software/charts/osh-infra/osh-infra-monitoring/chart-group.yaml diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/nagios.yaml b/global/software/charts/osh-infra/osh-infra-monitoring/nagios.yaml similarity index 100% rename from global/v4.0/software/charts/osh-infra/osh-infra-monitoring/nagios.yaml rename to global/software/charts/osh-infra/osh-infra-monitoring/nagios.yaml diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus-alertmanager.yaml b/global/software/charts/osh-infra/osh-infra-monitoring/prometheus-alertmanager.yaml similarity index 100% rename from global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus-alertmanager.yaml rename to global/software/charts/osh-infra/osh-infra-monitoring/prometheus-alertmanager.yaml diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus-kube-state-metrics.yaml b/global/software/charts/osh-infra/osh-infra-monitoring/prometheus-kube-state-metrics.yaml similarity index 100% rename from global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus-kube-state-metrics.yaml rename to global/software/charts/osh-infra/osh-infra-monitoring/prometheus-kube-state-metrics.yaml diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus-node-exporter.yaml b/global/software/charts/osh-infra/osh-infra-monitoring/prometheus-node-exporter.yaml similarity index 100% rename from global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus-node-exporter.yaml rename to global/software/charts/osh-infra/osh-infra-monitoring/prometheus-node-exporter.yaml diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus.yaml b/global/software/charts/osh-infra/osh-infra-monitoring/prometheus.yaml similarity index 100% rename from global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus.yaml rename to global/software/charts/osh-infra/osh-infra-monitoring/prometheus.yaml diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-openstack-exporter/chart-group.yaml b/global/software/charts/osh-infra/osh-infra-openstack-exporter/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/osh-infra/osh-infra-openstack-exporter/chart-group.yaml rename to global/software/charts/osh-infra/osh-infra-openstack-exporter/chart-group.yaml diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-openstack-exporter/prometheus-openstack-exporter.yaml b/global/software/charts/osh-infra/osh-infra-openstack-exporter/prometheus-openstack-exporter.yaml similarity index 100% rename from global/v4.0/software/charts/osh-infra/osh-infra-openstack-exporter/prometheus-openstack-exporter.yaml rename to global/software/charts/osh-infra/osh-infra-openstack-exporter/prometheus-openstack-exporter.yaml diff --git a/global/v4.0/software/charts/osh/dependencies.yaml b/global/software/charts/osh/dependencies.yaml similarity index 100% rename from global/v4.0/software/charts/osh/dependencies.yaml rename to global/software/charts/osh/dependencies.yaml diff --git a/global/v4.0/software/charts/osh/openstack-ceph-config/ceph-config.yaml b/global/software/charts/osh/openstack-ceph-config/ceph-config.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-ceph-config/ceph-config.yaml rename to global/software/charts/osh/openstack-ceph-config/ceph-config.yaml diff --git a/global/v4.0/software/charts/osh/openstack-ceph-config/chart-group.yaml b/global/software/charts/osh/openstack-ceph-config/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-ceph-config/chart-group.yaml rename to global/software/charts/osh/openstack-ceph-config/chart-group.yaml diff --git a/global/v4.0/software/charts/osh/openstack-cinder/chart-group.yaml b/global/software/charts/osh/openstack-cinder/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-cinder/chart-group.yaml rename to global/software/charts/osh/openstack-cinder/chart-group.yaml diff --git a/global/v4.0/software/charts/osh/openstack-cinder/cinder.yaml b/global/software/charts/osh/openstack-cinder/cinder.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-cinder/cinder.yaml rename to global/software/charts/osh/openstack-cinder/cinder.yaml diff --git a/global/v4.0/software/charts/osh/openstack-cinder/rabbitmq.yaml b/global/software/charts/osh/openstack-cinder/rabbitmq.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-cinder/rabbitmq.yaml rename to global/software/charts/osh/openstack-cinder/rabbitmq.yaml diff --git a/global/v4.0/software/charts/osh/openstack-compute-kit/chart-group.yaml b/global/software/charts/osh/openstack-compute-kit/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-compute-kit/chart-group.yaml rename to global/software/charts/osh/openstack-compute-kit/chart-group.yaml diff --git a/global/v4.0/software/charts/osh/openstack-compute-kit/libvirt.yaml b/global/software/charts/osh/openstack-compute-kit/libvirt.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-compute-kit/libvirt.yaml rename to global/software/charts/osh/openstack-compute-kit/libvirt.yaml diff --git a/global/v4.0/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml b/global/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml rename to global/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml diff --git a/global/v4.0/software/charts/osh/openstack-compute-kit/neutron.yaml b/global/software/charts/osh/openstack-compute-kit/neutron.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-compute-kit/neutron.yaml rename to global/software/charts/osh/openstack-compute-kit/neutron.yaml diff --git a/global/v4.0/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml b/global/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml rename to global/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml diff --git a/global/v4.0/software/charts/osh/openstack-compute-kit/nova.yaml b/global/software/charts/osh/openstack-compute-kit/nova.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-compute-kit/nova.yaml rename to global/software/charts/osh/openstack-compute-kit/nova.yaml diff --git a/global/v4.0/software/charts/osh/openstack-compute-kit/openvswitch.yaml b/global/software/charts/osh/openstack-compute-kit/openvswitch.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-compute-kit/openvswitch.yaml rename to global/software/charts/osh/openstack-compute-kit/openvswitch.yaml diff --git a/global/v4.0/software/charts/osh/openstack-glance/chart-group.yaml b/global/software/charts/osh/openstack-glance/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-glance/chart-group.yaml rename to global/software/charts/osh/openstack-glance/chart-group.yaml diff --git a/global/v4.0/software/charts/osh/openstack-glance/glance.yaml b/global/software/charts/osh/openstack-glance/glance.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-glance/glance.yaml rename to global/software/charts/osh/openstack-glance/glance.yaml diff --git a/global/v4.0/software/charts/osh/openstack-glance/rabbitmq.yaml b/global/software/charts/osh/openstack-glance/rabbitmq.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-glance/rabbitmq.yaml rename to global/software/charts/osh/openstack-glance/rabbitmq.yaml diff --git a/global/v4.0/software/charts/osh/openstack-heat/chart-group.yaml b/global/software/charts/osh/openstack-heat/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-heat/chart-group.yaml rename to global/software/charts/osh/openstack-heat/chart-group.yaml diff --git a/global/v4.0/software/charts/osh/openstack-heat/heat.yaml b/global/software/charts/osh/openstack-heat/heat.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-heat/heat.yaml rename to global/software/charts/osh/openstack-heat/heat.yaml diff --git a/global/v4.0/software/charts/osh/openstack-heat/rabbitmq.yaml b/global/software/charts/osh/openstack-heat/rabbitmq.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-heat/rabbitmq.yaml rename to global/software/charts/osh/openstack-heat/rabbitmq.yaml diff --git a/global/v4.0/software/charts/osh/openstack-horizon/chart-group.yaml b/global/software/charts/osh/openstack-horizon/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-horizon/chart-group.yaml rename to global/software/charts/osh/openstack-horizon/chart-group.yaml diff --git a/global/v4.0/software/charts/osh/openstack-horizon/horizon.yaml b/global/software/charts/osh/openstack-horizon/horizon.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-horizon/horizon.yaml rename to global/software/charts/osh/openstack-horizon/horizon.yaml diff --git a/global/v4.0/software/charts/osh/openstack-ingress-controller/chart-group.yaml b/global/software/charts/osh/openstack-ingress-controller/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-ingress-controller/chart-group.yaml rename to global/software/charts/osh/openstack-ingress-controller/chart-group.yaml diff --git a/global/v4.0/software/charts/osh/openstack-ingress-controller/ingress.yaml b/global/software/charts/osh/openstack-ingress-controller/ingress.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-ingress-controller/ingress.yaml rename to global/software/charts/osh/openstack-ingress-controller/ingress.yaml diff --git a/global/v4.0/software/charts/osh/openstack-keystone/chart-group.yaml b/global/software/charts/osh/openstack-keystone/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-keystone/chart-group.yaml rename to global/software/charts/osh/openstack-keystone/chart-group.yaml diff --git a/global/v4.0/software/charts/osh/openstack-keystone/keystone.yaml b/global/software/charts/osh/openstack-keystone/keystone.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-keystone/keystone.yaml rename to global/software/charts/osh/openstack-keystone/keystone.yaml diff --git a/global/v4.0/software/charts/osh/openstack-keystone/rabbitmq.yaml b/global/software/charts/osh/openstack-keystone/rabbitmq.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-keystone/rabbitmq.yaml rename to global/software/charts/osh/openstack-keystone/rabbitmq.yaml diff --git a/global/v4.0/software/charts/osh/openstack-mariadb/chart-group.yaml b/global/software/charts/osh/openstack-mariadb/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-mariadb/chart-group.yaml rename to global/software/charts/osh/openstack-mariadb/chart-group.yaml diff --git a/global/v4.0/software/charts/osh/openstack-mariadb/mariadb.yaml b/global/software/charts/osh/openstack-mariadb/mariadb.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-mariadb/mariadb.yaml rename to global/software/charts/osh/openstack-mariadb/mariadb.yaml diff --git a/global/v4.0/software/charts/osh/openstack-memcached/chart-group.yaml b/global/software/charts/osh/openstack-memcached/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-memcached/chart-group.yaml rename to global/software/charts/osh/openstack-memcached/chart-group.yaml diff --git a/global/v4.0/software/charts/osh/openstack-memcached/memcached.yaml b/global/software/charts/osh/openstack-memcached/memcached.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-memcached/memcached.yaml rename to global/software/charts/osh/openstack-memcached/memcached.yaml diff --git a/global/v4.0/software/charts/osh/openstack-radosgw/chart-group.yaml b/global/software/charts/osh/openstack-radosgw/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-radosgw/chart-group.yaml rename to global/software/charts/osh/openstack-radosgw/chart-group.yaml diff --git a/global/v4.0/software/charts/osh/openstack-radosgw/radosgw.yaml b/global/software/charts/osh/openstack-radosgw/radosgw.yaml similarity index 100% rename from global/v4.0/software/charts/osh/openstack-radosgw/radosgw.yaml rename to global/software/charts/osh/openstack-radosgw/radosgw.yaml diff --git a/global/v4.0/software/charts/ucp/armada/armada.yaml b/global/software/charts/ucp/armada/armada.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/armada/armada.yaml rename to global/software/charts/ucp/armada/armada.yaml diff --git a/global/v4.0/software/charts/ucp/armada/chart-group.yaml b/global/software/charts/ucp/armada/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/armada/chart-group.yaml rename to global/software/charts/ucp/armada/chart-group.yaml diff --git a/global/v4.0/software/charts/ucp/armada/tiller.yaml b/global/software/charts/ucp/armada/tiller.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/armada/tiller.yaml rename to global/software/charts/ucp/armada/tiller.yaml diff --git a/global/v4.0/software/charts/ucp/ceph-config/ceph-config.yaml b/global/software/charts/ucp/ceph-config/ceph-config.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/ceph-config/ceph-config.yaml rename to global/software/charts/ucp/ceph-config/ceph-config.yaml diff --git a/global/v4.0/software/charts/ucp/ceph-config/chart-group.yaml b/global/software/charts/ucp/ceph-config/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/ceph-config/chart-group.yaml rename to global/software/charts/ucp/ceph-config/chart-group.yaml diff --git a/global/v4.0/software/charts/ucp/ceph/ceph-client-update.yaml b/global/software/charts/ucp/ceph/ceph-client-update.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/ceph/ceph-client-update.yaml rename to global/software/charts/ucp/ceph/ceph-client-update.yaml diff --git a/global/v4.0/software/charts/ucp/ceph/ceph-client.yaml b/global/software/charts/ucp/ceph/ceph-client.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/ceph/ceph-client.yaml rename to global/software/charts/ucp/ceph/ceph-client.yaml diff --git a/global/v4.0/software/charts/ucp/ceph/ceph-htk.yaml b/global/software/charts/ucp/ceph/ceph-htk.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/ceph/ceph-htk.yaml rename to global/software/charts/ucp/ceph/ceph-htk.yaml diff --git a/global/v4.0/software/charts/ucp/ceph/ceph-ingress.yaml b/global/software/charts/ucp/ceph/ceph-ingress.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/ceph/ceph-ingress.yaml rename to global/software/charts/ucp/ceph/ceph-ingress.yaml diff --git a/global/v4.0/software/charts/ucp/ceph/ceph-mon.yaml b/global/software/charts/ucp/ceph/ceph-mon.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/ceph/ceph-mon.yaml rename to global/software/charts/ucp/ceph/ceph-mon.yaml diff --git a/global/v4.0/software/charts/ucp/ceph/ceph-osd.yaml b/global/software/charts/ucp/ceph/ceph-osd.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/ceph/ceph-osd.yaml rename to global/software/charts/ucp/ceph/ceph-osd.yaml diff --git a/global/v4.0/software/charts/ucp/ceph/ceph-provisioners.yaml b/global/software/charts/ucp/ceph/ceph-provisioners.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/ceph/ceph-provisioners.yaml rename to global/software/charts/ucp/ceph/ceph-provisioners.yaml diff --git a/global/v4.0/software/charts/ucp/ceph/ceph-rgw.yaml b/global/software/charts/ucp/ceph/ceph-rgw.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/ceph/ceph-rgw.yaml rename to global/software/charts/ucp/ceph/ceph-rgw.yaml diff --git a/global/v4.0/software/charts/ucp/ceph/chart-group-update.yaml b/global/software/charts/ucp/ceph/chart-group-update.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/ceph/chart-group-update.yaml rename to global/software/charts/ucp/ceph/chart-group-update.yaml diff --git a/global/v4.0/software/charts/ucp/ceph/chart-group.yaml b/global/software/charts/ucp/ceph/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/ceph/chart-group.yaml rename to global/software/charts/ucp/ceph/chart-group.yaml diff --git a/global/v4.0/software/charts/ucp/core/chart-group.yaml b/global/software/charts/ucp/core/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/core/chart-group.yaml rename to global/software/charts/ucp/core/chart-group.yaml diff --git a/global/v4.0/software/charts/ucp/core/ingress.yaml b/global/software/charts/ucp/core/ingress.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/core/ingress.yaml rename to global/software/charts/ucp/core/ingress.yaml diff --git a/global/v4.0/software/charts/ucp/core/mariadb.yaml b/global/software/charts/ucp/core/mariadb.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/core/mariadb.yaml rename to global/software/charts/ucp/core/mariadb.yaml diff --git a/global/v4.0/software/charts/ucp/core/postgresql.yaml b/global/software/charts/ucp/core/postgresql.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/core/postgresql.yaml rename to global/software/charts/ucp/core/postgresql.yaml diff --git a/global/v4.0/software/charts/ucp/core/rabbitmq.yaml b/global/software/charts/ucp/core/rabbitmq.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/core/rabbitmq.yaml rename to global/software/charts/ucp/core/rabbitmq.yaml diff --git a/global/v4.0/software/charts/ucp/deckhand/barbican.yaml b/global/software/charts/ucp/deckhand/barbican.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/deckhand/barbican.yaml rename to global/software/charts/ucp/deckhand/barbican.yaml diff --git a/global/v4.0/software/charts/ucp/deckhand/chart-group.yaml b/global/software/charts/ucp/deckhand/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/deckhand/chart-group.yaml rename to global/software/charts/ucp/deckhand/chart-group.yaml diff --git a/global/v4.0/software/charts/ucp/deckhand/deckhand.yaml b/global/software/charts/ucp/deckhand/deckhand.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/deckhand/deckhand.yaml rename to global/software/charts/ucp/deckhand/deckhand.yaml diff --git a/global/v4.0/software/charts/ucp/divingbell/chart-group.yaml b/global/software/charts/ucp/divingbell/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/divingbell/chart-group.yaml rename to global/software/charts/ucp/divingbell/chart-group.yaml diff --git a/global/v4.0/software/charts/ucp/divingbell/divingbell.yaml b/global/software/charts/ucp/divingbell/divingbell.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/divingbell/divingbell.yaml rename to global/software/charts/ucp/divingbell/divingbell.yaml diff --git a/global/v4.0/software/charts/ucp/drydock/chart-group.yaml b/global/software/charts/ucp/drydock/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/drydock/chart-group.yaml rename to global/software/charts/ucp/drydock/chart-group.yaml diff --git a/global/v4.0/software/charts/ucp/drydock/drydock.yaml b/global/software/charts/ucp/drydock/drydock.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/drydock/drydock.yaml rename to global/software/charts/ucp/drydock/drydock.yaml diff --git a/global/v4.0/software/charts/ucp/drydock/maas.yaml b/global/software/charts/ucp/drydock/maas.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/drydock/maas.yaml rename to global/software/charts/ucp/drydock/maas.yaml diff --git a/global/v4.0/software/charts/ucp/keystone/chart-group.yaml b/global/software/charts/ucp/keystone/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/keystone/chart-group.yaml rename to global/software/charts/ucp/keystone/chart-group.yaml diff --git a/global/v4.0/software/charts/ucp/keystone/keystone.yaml b/global/software/charts/ucp/keystone/keystone.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/keystone/keystone.yaml rename to global/software/charts/ucp/keystone/keystone.yaml diff --git a/global/v4.0/software/charts/ucp/keystone/memcached.yaml b/global/software/charts/ucp/keystone/memcached.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/keystone/memcached.yaml rename to global/software/charts/ucp/keystone/memcached.yaml diff --git a/global/v4.0/software/charts/ucp/promenade/chart-group.yaml b/global/software/charts/ucp/promenade/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/promenade/chart-group.yaml rename to global/software/charts/ucp/promenade/chart-group.yaml diff --git a/global/v4.0/software/charts/ucp/promenade/promenade.yaml b/global/software/charts/ucp/promenade/promenade.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/promenade/promenade.yaml rename to global/software/charts/ucp/promenade/promenade.yaml diff --git a/global/v4.0/software/charts/ucp/shipyard/chart-group.yaml b/global/software/charts/ucp/shipyard/chart-group.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/shipyard/chart-group.yaml rename to global/software/charts/ucp/shipyard/chart-group.yaml diff --git a/global/v4.0/software/charts/ucp/shipyard/shipyard.yaml b/global/software/charts/ucp/shipyard/shipyard.yaml similarity index 100% rename from global/v4.0/software/charts/ucp/shipyard/shipyard.yaml rename to global/software/charts/ucp/shipyard/shipyard.yaml diff --git a/global/v4.0/software/config/Docker.yaml b/global/software/config/Docker.yaml similarity index 100% rename from global/v4.0/software/config/Docker.yaml rename to global/software/config/Docker.yaml diff --git a/global/v4.0/software/config/Kubelet.yaml b/global/software/config/Kubelet.yaml similarity index 100% rename from global/v4.0/software/config/Kubelet.yaml rename to global/software/config/Kubelet.yaml diff --git a/global/v4.0/software/config/versions.yaml b/global/software/config/versions.yaml similarity index 100% rename from global/v4.0/software/config/versions.yaml rename to global/software/config/versions.yaml diff --git a/global/v4.0/software/manifests/bootstrap.yaml b/global/software/manifests/bootstrap.yaml similarity index 100% rename from global/v4.0/software/manifests/bootstrap.yaml rename to global/software/manifests/bootstrap.yaml diff --git a/global/v4.0/software/manifests/full-site.yaml b/global/software/manifests/full-site.yaml similarity index 100% rename from global/v4.0/software/manifests/full-site.yaml rename to global/software/manifests/full-site.yaml diff --git a/type/foundry/v4.0/network/KubernetesNetwork.yaml b/type/foundry/network/KubernetesNetwork.yaml similarity index 100% rename from type/foundry/v4.0/network/KubernetesNetwork.yaml rename to type/foundry/network/KubernetesNetwork.yaml