From fd54957eab67d22fcb1b8799cf5c53fea8128e92 Mon Sep 17 00:00:00 2001 From: Sreejith Punnapuzha Date: Wed, 26 May 2021 10:16:54 -0500 Subject: [PATCH] Rename virtual sites This commit renames virtual-network-cloud to virtual-multi-tenant. Signed-off-by: Sreejith Punnapuzha Change-Id: I93008034f4f8bba8b2ab464d45854190b195b818 --- .gitignore | 2 +- .../ephemeral/bootstrap/baremetalhost.yaml | 0 .../bootstrap/hostgenerator/host-generation.yaml | 0 .../bootstrap/hostgenerator/kustomization.yaml | 0 .../ephemeral/bootstrap/kustomization.yaml | 0 .../ephemeral/catalogues/README.md | 8 ++++---- .../ephemeral/catalogues/kustomization.yaml | 0 .../ephemeral/catalogues/networking.yaml | 3 +-- .../controlplane/hostgenerator/host-generation.yaml | 0 .../controlplane/hostgenerator/kustomization.yaml | 0 .../hostgenerator/patch-delete-catalogues.yaml | 0 .../ephemeral/controlplane/kustomization.yaml | 0 .../ephemeral/controlplane/nodes/kustomization.yaml | 0 .../controlplane/versions-catalogue-patch.yaml | 0 .../ephemeral/initinfra-networking/kustomization.yaml | 0 .../ephemeral/initinfra/kustomization.yaml | 0 .../host-inventory/hostgenerator/host-generation.yaml | 0 .../host-inventory/hostgenerator/kustomization.yaml | 0 .../host-inventory/kustomization.yaml | 0 .../kubeconfig/kubeconfig.yaml | 0 .../kubeconfig/kustomization.yaml | 0 .../kubeconfig/update-target.yaml | 0 manifests/site/virtual-multi-tenant/metadata.yaml | 11 +++++++++++ .../phases/kustomization.yaml | 0 .../phases/phase-patch.yaml | 0 .../sub-clusters/lma/catalogues/kustomization.yaml | 1 - .../lma/catalogues/patches/versions-treasuremap.yaml | 0 .../sub-clusters/lma/controlplane/kustomization.yaml | 0 .../lma/initinfra-networking/kustomization.yaml | 0 .../sub-clusters/lma/initinfra/kustomization.yaml | 0 .../sub-clusters/lma/lma-configs/kustomization.yaml | 0 .../sub-clusters/lma/provide-infra/kustomization.yaml | 0 .../sub-clusters/lma/workers/kustomization.yaml | 0 .../sub-clusters/lma/workload/kustomization.yaml | 0 .../wordpress/catalogues/kustomization.yaml | 1 - .../catalogues/patches/versions-treasuremap.yaml | 0 .../wordpress/controlplane/kustomization.yaml | 0 .../wordpress/initinfra-networking/kustomization.yaml | 0 .../wordpress/initinfra/kustomization.yaml | 0 .../initinfra/replacements/kustomization.yaml | 0 .../wordpress/provide-infra/kustomization.yaml | 0 .../sub-clusters/wordpress/workers/kustomization.yaml | 0 .../wordpress/workload/kustomization.yaml | 0 .../target/catalogues/README.md | 10 +++++----- .../target/catalogues/hosts.yaml | 1 - .../target/catalogues/kustomization.yaml | 0 .../target/catalogues/networking.yaml | 1 - .../catalogues/patches/versions-airshipctl.yaml | 0 .../catalogues/patches/versions-treasuremap.yaml | 0 .../target/encrypted/README.md | 0 .../target/encrypted/generator/kustomization.yaml | 0 .../target/encrypted/importer/kustomization.yaml | 0 .../encrypted/results/generated/kustomization.yaml | 0 .../target/encrypted/results/generated/secrets.yaml | 0 .../encrypted/results/imported/kustomization.yaml | 0 .../target/encrypted/results/imported/secrets.yaml | 0 .../target/encrypted/results/kustomization.yaml | 0 .../target/initinfra-networking/kustomization.yaml | 0 .../target/initinfra/kustomization.yaml | 0 .../target/workers/hostgenerator/host-generation.yaml | 0 .../target/workers/hostgenerator/kustomization.yaml | 0 .../target/workers/kustomization.yaml | 0 .../target/workers/nodes/kustomization.yaml | 0 .../target/workers/provision/kustomization.yaml | 0 .../target/workload-config/kustomization.yaml | 0 .../target/workload/kustomization.yaml | 0 .../target/workload/network-policy/kustomization.yaml | 0 .../target/workload/patch-delete-storage-cluster.yaml | 0 .../workload/patch-deploy-false-storage-cluster.yaml | 0 manifests/site/virtual-network-cloud/metadata.yaml | 11 ----------- zuul.d/jobs.yaml | 6 +++--- zuul.d/projects.yaml | 2 +- 72 files changed, 26 insertions(+), 31 deletions(-) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/ephemeral/bootstrap/baremetalhost.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/ephemeral/bootstrap/hostgenerator/host-generation.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/ephemeral/bootstrap/hostgenerator/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/ephemeral/bootstrap/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/ephemeral/catalogues/README.md (98%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/ephemeral/catalogues/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/ephemeral/catalogues/networking.yaml (99%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/ephemeral/controlplane/hostgenerator/host-generation.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/ephemeral/controlplane/hostgenerator/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/ephemeral/controlplane/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/ephemeral/controlplane/nodes/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/ephemeral/controlplane/versions-catalogue-patch.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/ephemeral/initinfra-networking/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/ephemeral/initinfra/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/host-inventory/hostgenerator/host-generation.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/host-inventory/hostgenerator/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/host-inventory/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/kubeconfig/kubeconfig.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/kubeconfig/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/kubeconfig/update-target.yaml (100%) create mode 100644 manifests/site/virtual-multi-tenant/metadata.yaml rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/phases/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/phases/phase-patch.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/sub-clusters/lma/catalogues/kustomization.yaml (99%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/sub-clusters/lma/catalogues/patches/versions-treasuremap.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/sub-clusters/lma/controlplane/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/sub-clusters/lma/initinfra-networking/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/sub-clusters/lma/initinfra/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/sub-clusters/lma/lma-configs/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/sub-clusters/lma/provide-infra/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/sub-clusters/lma/workers/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/sub-clusters/lma/workload/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/sub-clusters/wordpress/catalogues/kustomization.yaml (99%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/sub-clusters/wordpress/catalogues/patches/versions-treasuremap.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/sub-clusters/wordpress/controlplane/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/sub-clusters/wordpress/initinfra-networking/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/sub-clusters/wordpress/initinfra/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/sub-clusters/wordpress/initinfra/replacements/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/sub-clusters/wordpress/provide-infra/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/sub-clusters/wordpress/workers/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/sub-clusters/wordpress/workload/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/catalogues/README.md (97%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/catalogues/hosts.yaml (99%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/catalogues/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/catalogues/networking.yaml (99%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/catalogues/patches/versions-airshipctl.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/catalogues/patches/versions-treasuremap.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/encrypted/README.md (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/encrypted/generator/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/encrypted/importer/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/encrypted/results/generated/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/encrypted/results/generated/secrets.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/encrypted/results/imported/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/encrypted/results/imported/secrets.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/encrypted/results/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/initinfra-networking/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/initinfra/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/workers/hostgenerator/host-generation.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/workers/hostgenerator/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/workers/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/workers/nodes/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/workers/provision/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/workload-config/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/workload/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/workload/network-policy/kustomization.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/workload/patch-delete-storage-cluster.yaml (100%) rename manifests/site/{virtual-network-cloud => virtual-multi-tenant}/target/workload/patch-deploy-false-storage-cluster.yaml (100%) delete mode 100644 manifests/site/virtual-network-cloud/metadata.yaml diff --git a/.gitignore b/.gitignore index 7e9ab13a7..40432487e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ .tox/ build/ -manifests/site/virtual-network-cloud/ephemeral/controlplane/before.yaml +manifests/site/virtual-multi-tenant/ephemeral/controlplane/before.yaml diff --git a/manifests/site/virtual-network-cloud/ephemeral/bootstrap/baremetalhost.yaml b/manifests/site/virtual-multi-tenant/ephemeral/bootstrap/baremetalhost.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/ephemeral/bootstrap/baremetalhost.yaml rename to manifests/site/virtual-multi-tenant/ephemeral/bootstrap/baremetalhost.yaml diff --git a/manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/host-generation.yaml b/manifests/site/virtual-multi-tenant/ephemeral/bootstrap/hostgenerator/host-generation.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/host-generation.yaml rename to manifests/site/virtual-multi-tenant/ephemeral/bootstrap/hostgenerator/host-generation.yaml diff --git a/manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/kustomization.yaml b/manifests/site/virtual-multi-tenant/ephemeral/bootstrap/hostgenerator/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/kustomization.yaml rename to manifests/site/virtual-multi-tenant/ephemeral/bootstrap/hostgenerator/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/ephemeral/bootstrap/kustomization.yaml b/manifests/site/virtual-multi-tenant/ephemeral/bootstrap/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/ephemeral/bootstrap/kustomization.yaml rename to manifests/site/virtual-multi-tenant/ephemeral/bootstrap/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/ephemeral/catalogues/README.md b/manifests/site/virtual-multi-tenant/ephemeral/catalogues/README.md similarity index 98% rename from manifests/site/virtual-network-cloud/ephemeral/catalogues/README.md rename to manifests/site/virtual-multi-tenant/ephemeral/catalogues/README.md index edfffd775..afcdfc3cb 100755 --- a/manifests/site/virtual-network-cloud/ephemeral/catalogues/README.md +++ b/manifests/site/virtual-multi-tenant/ephemeral/catalogues/README.md @@ -1,4 +1,4 @@ -# Catalogue Definitions for Target Cluster - -This inherits Site-level catalogues from the neighboring target cluster's -`catalogues` kustomization, and tweaks a few values for the ephemeral cluster. +# Catalogue Definitions for Target Cluster + +This inherits Site-level catalogues from the neighboring target cluster's +`catalogues` kustomization, and tweaks a few values for the ephemeral cluster. diff --git a/manifests/site/virtual-network-cloud/ephemeral/catalogues/kustomization.yaml b/manifests/site/virtual-multi-tenant/ephemeral/catalogues/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/ephemeral/catalogues/kustomization.yaml rename to manifests/site/virtual-multi-tenant/ephemeral/catalogues/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/ephemeral/catalogues/networking.yaml b/manifests/site/virtual-multi-tenant/ephemeral/catalogues/networking.yaml similarity index 99% rename from manifests/site/virtual-network-cloud/ephemeral/catalogues/networking.yaml rename to manifests/site/virtual-multi-tenant/ephemeral/catalogues/networking.yaml index d810fd5ac..6a27a66c5 100644 --- a/manifests/site/virtual-network-cloud/ephemeral/catalogues/networking.yaml +++ b/manifests/site/virtual-multi-tenant/ephemeral/catalogues/networking.yaml @@ -14,8 +14,7 @@ spec: controlPlaneEndpoint: host: "10.23.25.101" apiserverCertSANs: "[10.23.25.101, 10.23.24.101]" - + ironic: provisioningIp: "10.23.24.101" dhcpRange: "10.23.24.200,10.23.24.250" - diff --git a/manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/host-generation.yaml b/manifests/site/virtual-multi-tenant/ephemeral/controlplane/hostgenerator/host-generation.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/host-generation.yaml rename to manifests/site/virtual-multi-tenant/ephemeral/controlplane/hostgenerator/host-generation.yaml diff --git a/manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/kustomization.yaml b/manifests/site/virtual-multi-tenant/ephemeral/controlplane/hostgenerator/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/kustomization.yaml rename to manifests/site/virtual-multi-tenant/ephemeral/controlplane/hostgenerator/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml b/manifests/site/virtual-multi-tenant/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml rename to manifests/site/virtual-multi-tenant/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml diff --git a/manifests/site/virtual-network-cloud/ephemeral/controlplane/kustomization.yaml b/manifests/site/virtual-multi-tenant/ephemeral/controlplane/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/ephemeral/controlplane/kustomization.yaml rename to manifests/site/virtual-multi-tenant/ephemeral/controlplane/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/ephemeral/controlplane/nodes/kustomization.yaml b/manifests/site/virtual-multi-tenant/ephemeral/controlplane/nodes/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/ephemeral/controlplane/nodes/kustomization.yaml rename to manifests/site/virtual-multi-tenant/ephemeral/controlplane/nodes/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/ephemeral/controlplane/versions-catalogue-patch.yaml b/manifests/site/virtual-multi-tenant/ephemeral/controlplane/versions-catalogue-patch.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/ephemeral/controlplane/versions-catalogue-patch.yaml rename to manifests/site/virtual-multi-tenant/ephemeral/controlplane/versions-catalogue-patch.yaml diff --git a/manifests/site/virtual-network-cloud/ephemeral/initinfra-networking/kustomization.yaml b/manifests/site/virtual-multi-tenant/ephemeral/initinfra-networking/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/ephemeral/initinfra-networking/kustomization.yaml rename to manifests/site/virtual-multi-tenant/ephemeral/initinfra-networking/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/ephemeral/initinfra/kustomization.yaml b/manifests/site/virtual-multi-tenant/ephemeral/initinfra/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/ephemeral/initinfra/kustomization.yaml rename to manifests/site/virtual-multi-tenant/ephemeral/initinfra/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/host-inventory/hostgenerator/host-generation.yaml b/manifests/site/virtual-multi-tenant/host-inventory/hostgenerator/host-generation.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/host-inventory/hostgenerator/host-generation.yaml rename to manifests/site/virtual-multi-tenant/host-inventory/hostgenerator/host-generation.yaml diff --git a/manifests/site/virtual-network-cloud/host-inventory/hostgenerator/kustomization.yaml b/manifests/site/virtual-multi-tenant/host-inventory/hostgenerator/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/host-inventory/hostgenerator/kustomization.yaml rename to manifests/site/virtual-multi-tenant/host-inventory/hostgenerator/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/host-inventory/kustomization.yaml b/manifests/site/virtual-multi-tenant/host-inventory/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/host-inventory/kustomization.yaml rename to manifests/site/virtual-multi-tenant/host-inventory/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/kubeconfig/kubeconfig.yaml b/manifests/site/virtual-multi-tenant/kubeconfig/kubeconfig.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/kubeconfig/kubeconfig.yaml rename to manifests/site/virtual-multi-tenant/kubeconfig/kubeconfig.yaml diff --git a/manifests/site/virtual-network-cloud/kubeconfig/kustomization.yaml b/manifests/site/virtual-multi-tenant/kubeconfig/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/kubeconfig/kustomization.yaml rename to manifests/site/virtual-multi-tenant/kubeconfig/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/kubeconfig/update-target.yaml b/manifests/site/virtual-multi-tenant/kubeconfig/update-target.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/kubeconfig/update-target.yaml rename to manifests/site/virtual-multi-tenant/kubeconfig/update-target.yaml diff --git a/manifests/site/virtual-multi-tenant/metadata.yaml b/manifests/site/virtual-multi-tenant/metadata.yaml new file mode 100644 index 000000000..9ff1a5231 --- /dev/null +++ b/manifests/site/virtual-multi-tenant/metadata.yaml @@ -0,0 +1,11 @@ +apiVersion: airshipit.org/v1alpha1 +kind: ManifestMetadata +metadata: + name: manifest-metadata +spec: + phase: + docEntryPointPrefix: manifests/site/virtual-multi-tenant + path: manifests/site/virtual-multi-tenant/phases + + inventory: + path: manifests/site/virtual-multi-tenant/host-inventory diff --git a/manifests/site/virtual-network-cloud/phases/kustomization.yaml b/manifests/site/virtual-multi-tenant/phases/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/phases/kustomization.yaml rename to manifests/site/virtual-multi-tenant/phases/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/phases/phase-patch.yaml b/manifests/site/virtual-multi-tenant/phases/phase-patch.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/phases/phase-patch.yaml rename to manifests/site/virtual-multi-tenant/phases/phase-patch.yaml diff --git a/manifests/site/virtual-network-cloud/sub-clusters/lma/catalogues/kustomization.yaml b/manifests/site/virtual-multi-tenant/sub-clusters/lma/catalogues/kustomization.yaml similarity index 99% rename from manifests/site/virtual-network-cloud/sub-clusters/lma/catalogues/kustomization.yaml rename to manifests/site/virtual-multi-tenant/sub-clusters/lma/catalogues/kustomization.yaml index 8a4daace5..70cb08406 100644 --- a/manifests/site/virtual-network-cloud/sub-clusters/lma/catalogues/kustomization.yaml +++ b/manifests/site/virtual-multi-tenant/sub-clusters/lma/catalogues/kustomization.yaml @@ -13,4 +13,3 @@ transformers: # This replaces lma-specific network data from the lma stanza # of the subcluster-networking catalogue into the standard networking catalogue - ../../../../../type/multi-tenant/sub-clusters/lma/catalogue-replacements - diff --git a/manifests/site/virtual-network-cloud/sub-clusters/lma/catalogues/patches/versions-treasuremap.yaml b/manifests/site/virtual-multi-tenant/sub-clusters/lma/catalogues/patches/versions-treasuremap.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/sub-clusters/lma/catalogues/patches/versions-treasuremap.yaml rename to manifests/site/virtual-multi-tenant/sub-clusters/lma/catalogues/patches/versions-treasuremap.yaml diff --git a/manifests/site/virtual-network-cloud/sub-clusters/lma/controlplane/kustomization.yaml b/manifests/site/virtual-multi-tenant/sub-clusters/lma/controlplane/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/sub-clusters/lma/controlplane/kustomization.yaml rename to manifests/site/virtual-multi-tenant/sub-clusters/lma/controlplane/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/sub-clusters/lma/initinfra-networking/kustomization.yaml b/manifests/site/virtual-multi-tenant/sub-clusters/lma/initinfra-networking/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/sub-clusters/lma/initinfra-networking/kustomization.yaml rename to manifests/site/virtual-multi-tenant/sub-clusters/lma/initinfra-networking/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/sub-clusters/lma/initinfra/kustomization.yaml b/manifests/site/virtual-multi-tenant/sub-clusters/lma/initinfra/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/sub-clusters/lma/initinfra/kustomization.yaml rename to manifests/site/virtual-multi-tenant/sub-clusters/lma/initinfra/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/sub-clusters/lma/lma-configs/kustomization.yaml b/manifests/site/virtual-multi-tenant/sub-clusters/lma/lma-configs/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/sub-clusters/lma/lma-configs/kustomization.yaml rename to manifests/site/virtual-multi-tenant/sub-clusters/lma/lma-configs/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/sub-clusters/lma/provide-infra/kustomization.yaml b/manifests/site/virtual-multi-tenant/sub-clusters/lma/provide-infra/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/sub-clusters/lma/provide-infra/kustomization.yaml rename to manifests/site/virtual-multi-tenant/sub-clusters/lma/provide-infra/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/sub-clusters/lma/workers/kustomization.yaml b/manifests/site/virtual-multi-tenant/sub-clusters/lma/workers/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/sub-clusters/lma/workers/kustomization.yaml rename to manifests/site/virtual-multi-tenant/sub-clusters/lma/workers/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/sub-clusters/lma/workload/kustomization.yaml b/manifests/site/virtual-multi-tenant/sub-clusters/lma/workload/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/sub-clusters/lma/workload/kustomization.yaml rename to manifests/site/virtual-multi-tenant/sub-clusters/lma/workload/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/sub-clusters/wordpress/catalogues/kustomization.yaml b/manifests/site/virtual-multi-tenant/sub-clusters/wordpress/catalogues/kustomization.yaml similarity index 99% rename from manifests/site/virtual-network-cloud/sub-clusters/wordpress/catalogues/kustomization.yaml rename to manifests/site/virtual-multi-tenant/sub-clusters/wordpress/catalogues/kustomization.yaml index b693ef284..1beee2ea7 100644 --- a/manifests/site/virtual-network-cloud/sub-clusters/wordpress/catalogues/kustomization.yaml +++ b/manifests/site/virtual-multi-tenant/sub-clusters/wordpress/catalogues/kustomization.yaml @@ -13,4 +13,3 @@ transformers: # This replaces wordpress-specific network data from the wordpress stanza # of the subcluster-networking catalogue into the standard networking catalogue - ../../../../../type/multi-tenant/sub-clusters/wordpress/catalogue-replacements - diff --git a/manifests/site/virtual-network-cloud/sub-clusters/wordpress/catalogues/patches/versions-treasuremap.yaml b/manifests/site/virtual-multi-tenant/sub-clusters/wordpress/catalogues/patches/versions-treasuremap.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/sub-clusters/wordpress/catalogues/patches/versions-treasuremap.yaml rename to manifests/site/virtual-multi-tenant/sub-clusters/wordpress/catalogues/patches/versions-treasuremap.yaml diff --git a/manifests/site/virtual-network-cloud/sub-clusters/wordpress/controlplane/kustomization.yaml b/manifests/site/virtual-multi-tenant/sub-clusters/wordpress/controlplane/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/sub-clusters/wordpress/controlplane/kustomization.yaml rename to manifests/site/virtual-multi-tenant/sub-clusters/wordpress/controlplane/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/sub-clusters/wordpress/initinfra-networking/kustomization.yaml b/manifests/site/virtual-multi-tenant/sub-clusters/wordpress/initinfra-networking/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/sub-clusters/wordpress/initinfra-networking/kustomization.yaml rename to manifests/site/virtual-multi-tenant/sub-clusters/wordpress/initinfra-networking/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/sub-clusters/wordpress/initinfra/kustomization.yaml b/manifests/site/virtual-multi-tenant/sub-clusters/wordpress/initinfra/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/sub-clusters/wordpress/initinfra/kustomization.yaml rename to manifests/site/virtual-multi-tenant/sub-clusters/wordpress/initinfra/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/sub-clusters/wordpress/initinfra/replacements/kustomization.yaml b/manifests/site/virtual-multi-tenant/sub-clusters/wordpress/initinfra/replacements/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/sub-clusters/wordpress/initinfra/replacements/kustomization.yaml rename to manifests/site/virtual-multi-tenant/sub-clusters/wordpress/initinfra/replacements/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/sub-clusters/wordpress/provide-infra/kustomization.yaml b/manifests/site/virtual-multi-tenant/sub-clusters/wordpress/provide-infra/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/sub-clusters/wordpress/provide-infra/kustomization.yaml rename to manifests/site/virtual-multi-tenant/sub-clusters/wordpress/provide-infra/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/sub-clusters/wordpress/workers/kustomization.yaml b/manifests/site/virtual-multi-tenant/sub-clusters/wordpress/workers/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/sub-clusters/wordpress/workers/kustomization.yaml rename to manifests/site/virtual-multi-tenant/sub-clusters/wordpress/workers/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/sub-clusters/wordpress/workload/kustomization.yaml b/manifests/site/virtual-multi-tenant/sub-clusters/wordpress/workload/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/sub-clusters/wordpress/workload/kustomization.yaml rename to manifests/site/virtual-multi-tenant/sub-clusters/wordpress/workload/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/target/catalogues/README.md b/manifests/site/virtual-multi-tenant/target/catalogues/README.md similarity index 97% rename from manifests/site/virtual-network-cloud/target/catalogues/README.md rename to manifests/site/virtual-multi-tenant/target/catalogues/README.md index 2cf4557b1..3a3306449 100755 --- a/manifests/site/virtual-network-cloud/target/catalogues/README.md +++ b/manifests/site/virtual-multi-tenant/target/catalogues/README.md @@ -1,5 +1,5 @@ -# Catalogue Definitions for Target Cluster - -This inherits Type-level catalogues, and adds in Site-specific values. -The neighboring ephemeral cluster's `catalogues` entrypoint applies further -customizations on top of this for ephemeral use. +# Catalogue Definitions for Target Cluster + +This inherits Type-level catalogues, and adds in Site-specific values. +The neighboring ephemeral cluster's `catalogues` entrypoint applies further +customizations on top of this for ephemeral use. diff --git a/manifests/site/virtual-network-cloud/target/catalogues/hosts.yaml b/manifests/site/virtual-multi-tenant/target/catalogues/hosts.yaml similarity index 99% rename from manifests/site/virtual-network-cloud/target/catalogues/hosts.yaml rename to manifests/site/virtual-multi-tenant/target/catalogues/hosts.yaml index 3c98d83a3..41f24be2c 100644 --- a/manifests/site/virtual-network-cloud/target/catalogues/hosts.yaml +++ b/manifests/site/virtual-multi-tenant/target/catalogues/hosts.yaml @@ -76,4 +76,3 @@ hosts: labels: airshipit.org/rack: r01 airshipit.org/server: node04 - diff --git a/manifests/site/virtual-network-cloud/target/catalogues/kustomization.yaml b/manifests/site/virtual-multi-tenant/target/catalogues/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/target/catalogues/kustomization.yaml rename to manifests/site/virtual-multi-tenant/target/catalogues/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/target/catalogues/networking.yaml b/manifests/site/virtual-multi-tenant/target/catalogues/networking.yaml similarity index 99% rename from manifests/site/virtual-network-cloud/target/catalogues/networking.yaml rename to manifests/site/virtual-multi-tenant/target/catalogues/networking.yaml index 674785666..305c7fcfc 100644 --- a/manifests/site/virtual-network-cloud/target/catalogues/networking.yaml +++ b/manifests/site/virtual-multi-tenant/target/catalogues/networking.yaml @@ -17,4 +17,3 @@ spec: ironic: provisioningIp: "10.23.24.102" dhcpRange: "10.23.24.200,10.23.24.250" - diff --git a/manifests/site/virtual-network-cloud/target/catalogues/patches/versions-airshipctl.yaml b/manifests/site/virtual-multi-tenant/target/catalogues/patches/versions-airshipctl.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/target/catalogues/patches/versions-airshipctl.yaml rename to manifests/site/virtual-multi-tenant/target/catalogues/patches/versions-airshipctl.yaml diff --git a/manifests/site/virtual-network-cloud/target/catalogues/patches/versions-treasuremap.yaml b/manifests/site/virtual-multi-tenant/target/catalogues/patches/versions-treasuremap.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/target/catalogues/patches/versions-treasuremap.yaml rename to manifests/site/virtual-multi-tenant/target/catalogues/patches/versions-treasuremap.yaml diff --git a/manifests/site/virtual-network-cloud/target/encrypted/README.md b/manifests/site/virtual-multi-tenant/target/encrypted/README.md similarity index 100% rename from manifests/site/virtual-network-cloud/target/encrypted/README.md rename to manifests/site/virtual-multi-tenant/target/encrypted/README.md diff --git a/manifests/site/virtual-network-cloud/target/encrypted/generator/kustomization.yaml b/manifests/site/virtual-multi-tenant/target/encrypted/generator/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/target/encrypted/generator/kustomization.yaml rename to manifests/site/virtual-multi-tenant/target/encrypted/generator/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/target/encrypted/importer/kustomization.yaml b/manifests/site/virtual-multi-tenant/target/encrypted/importer/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/target/encrypted/importer/kustomization.yaml rename to manifests/site/virtual-multi-tenant/target/encrypted/importer/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/target/encrypted/results/generated/kustomization.yaml b/manifests/site/virtual-multi-tenant/target/encrypted/results/generated/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/target/encrypted/results/generated/kustomization.yaml rename to manifests/site/virtual-multi-tenant/target/encrypted/results/generated/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/target/encrypted/results/generated/secrets.yaml b/manifests/site/virtual-multi-tenant/target/encrypted/results/generated/secrets.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/target/encrypted/results/generated/secrets.yaml rename to manifests/site/virtual-multi-tenant/target/encrypted/results/generated/secrets.yaml diff --git a/manifests/site/virtual-network-cloud/target/encrypted/results/imported/kustomization.yaml b/manifests/site/virtual-multi-tenant/target/encrypted/results/imported/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/target/encrypted/results/imported/kustomization.yaml rename to manifests/site/virtual-multi-tenant/target/encrypted/results/imported/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/target/encrypted/results/imported/secrets.yaml b/manifests/site/virtual-multi-tenant/target/encrypted/results/imported/secrets.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/target/encrypted/results/imported/secrets.yaml rename to manifests/site/virtual-multi-tenant/target/encrypted/results/imported/secrets.yaml diff --git a/manifests/site/virtual-network-cloud/target/encrypted/results/kustomization.yaml b/manifests/site/virtual-multi-tenant/target/encrypted/results/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/target/encrypted/results/kustomization.yaml rename to manifests/site/virtual-multi-tenant/target/encrypted/results/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/target/initinfra-networking/kustomization.yaml b/manifests/site/virtual-multi-tenant/target/initinfra-networking/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/target/initinfra-networking/kustomization.yaml rename to manifests/site/virtual-multi-tenant/target/initinfra-networking/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/target/initinfra/kustomization.yaml b/manifests/site/virtual-multi-tenant/target/initinfra/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/target/initinfra/kustomization.yaml rename to manifests/site/virtual-multi-tenant/target/initinfra/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/target/workers/hostgenerator/host-generation.yaml b/manifests/site/virtual-multi-tenant/target/workers/hostgenerator/host-generation.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/target/workers/hostgenerator/host-generation.yaml rename to manifests/site/virtual-multi-tenant/target/workers/hostgenerator/host-generation.yaml diff --git a/manifests/site/virtual-network-cloud/target/workers/hostgenerator/kustomization.yaml b/manifests/site/virtual-multi-tenant/target/workers/hostgenerator/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/target/workers/hostgenerator/kustomization.yaml rename to manifests/site/virtual-multi-tenant/target/workers/hostgenerator/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/target/workers/kustomization.yaml b/manifests/site/virtual-multi-tenant/target/workers/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/target/workers/kustomization.yaml rename to manifests/site/virtual-multi-tenant/target/workers/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/target/workers/nodes/kustomization.yaml b/manifests/site/virtual-multi-tenant/target/workers/nodes/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/target/workers/nodes/kustomization.yaml rename to manifests/site/virtual-multi-tenant/target/workers/nodes/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/target/workers/provision/kustomization.yaml b/manifests/site/virtual-multi-tenant/target/workers/provision/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/target/workers/provision/kustomization.yaml rename to manifests/site/virtual-multi-tenant/target/workers/provision/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/target/workload-config/kustomization.yaml b/manifests/site/virtual-multi-tenant/target/workload-config/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/target/workload-config/kustomization.yaml rename to manifests/site/virtual-multi-tenant/target/workload-config/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml b/manifests/site/virtual-multi-tenant/target/workload/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/target/workload/kustomization.yaml rename to manifests/site/virtual-multi-tenant/target/workload/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/target/workload/network-policy/kustomization.yaml b/manifests/site/virtual-multi-tenant/target/workload/network-policy/kustomization.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/target/workload/network-policy/kustomization.yaml rename to manifests/site/virtual-multi-tenant/target/workload/network-policy/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/target/workload/patch-delete-storage-cluster.yaml b/manifests/site/virtual-multi-tenant/target/workload/patch-delete-storage-cluster.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/target/workload/patch-delete-storage-cluster.yaml rename to manifests/site/virtual-multi-tenant/target/workload/patch-delete-storage-cluster.yaml diff --git a/manifests/site/virtual-network-cloud/target/workload/patch-deploy-false-storage-cluster.yaml b/manifests/site/virtual-multi-tenant/target/workload/patch-deploy-false-storage-cluster.yaml similarity index 100% rename from manifests/site/virtual-network-cloud/target/workload/patch-deploy-false-storage-cluster.yaml rename to manifests/site/virtual-multi-tenant/target/workload/patch-deploy-false-storage-cluster.yaml diff --git a/manifests/site/virtual-network-cloud/metadata.yaml b/manifests/site/virtual-network-cloud/metadata.yaml deleted file mode 100644 index a2511fea0..000000000 --- a/manifests/site/virtual-network-cloud/metadata.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: airshipit.org/v1alpha1 -kind: ManifestMetadata -metadata: - name: manifest-metadata -spec: - phase: - docEntryPointPrefix: manifests/site/virtual-network-cloud - path: manifests/site/virtual-network-cloud/phases - - inventory: - path: manifests/site/virtual-network-cloud/host-inventory diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 64cd4d6e7..12c036df8 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -81,10 +81,10 @@ voting: true - job: - name: airship-treasuremap-deploy-virtual-network-cloud + name: airship-treasuremap-deploy-virtual-multi-tenant parent: airship-treasuremap-deploy-virtual-airship-core vars: - site_name: virtual-network-cloud + site_name: virtual-multi-tenant gate_scripts: - ./tools/deployment/multi-tenant/01_install_essentials.sh - ./tools/deployment/multi-tenant/22_test_configs.sh @@ -101,7 +101,7 @@ - ./tools/deployment/multi-tenant/360_deploy_workload.sh - ./tools/deployment/multi-tenant/361_deploy_workload_config.sh files: - - ^manifests/site/virtual-network-cloud/.*$ + - ^manifests/site/virtual-multi-tenant/.*$ - ^manifests/type/multi-tenant/.*$ - ^manifests/function/.*$ - ^manifests/composite/.*$ diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index de0dcd340..8b3c82b40 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -29,7 +29,7 @@ # - airship-treasuremap-functional-existing-k8s TODO: Enable this when functional tests exist, and a cluster is up experimental: jobs: - - airship-treasuremap-deploy-virtual-network-cloud: + - airship-treasuremap-deploy-virtual-multi-tenant: voting: false post: