From b9be1c64c8cf6382223984fda27da402d961ac9e Mon Sep 17 00:00:00 2001 From: "Manoj Alva(ma257n)" Date: Thu, 25 Feb 2021 09:47:58 +0000 Subject: [PATCH] Rename network-cloud type to multi-tenant type changes. Change-Id: I668b9826f02c9593ad591add188f49b45c7679f8 --- .../ephemeral/bootstrap/kustomization.yaml | 4 ++-- .../ephemeral/controlplane/kustomization.yaml | 4 ++-- .../ephemeral/initinfra/kustomization.yaml | 2 +- .../site/virtual-network-cloud/phases/kustomization.yaml | 2 +- .../target/catalogues/kustomization.yaml | 2 +- manifests/type/multi-tenant/README.md | 7 +++++++ .../ephemeral/bootstrap/kustomization.yaml | 0 .../ephemeral/bootstrap/replacements/kustomization.yaml | 0 .../ephemeral/controlplane/kustomization.yaml | 0 .../ephemeral/controlplane/replacements/kustomization.yaml | 0 .../ephemeral/initinfra/kustomization.yaml | 0 .../ephemeral/initinfra/replacements/kustomization.yaml | 0 manifests/type/multi-tenant/metadata.yaml | 3 +++ .../phases/kustomization.yaml | 0 .../shared/catalogues/kustomization.yaml | 0 .../shared/catalogues/networking.yaml | 0 .../shared/catalogues/versions.yaml | 0 .../target/workload/kustomization.yaml | 0 manifests/type/network-cloud/README.md | 6 ------ manifests/type/network-cloud/metadata.yaml | 3 --- 20 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 manifests/type/multi-tenant/README.md rename manifests/type/{network-cloud => multi-tenant}/ephemeral/bootstrap/kustomization.yaml (100%) rename manifests/type/{network-cloud => multi-tenant}/ephemeral/bootstrap/replacements/kustomization.yaml (100%) rename manifests/type/{network-cloud => multi-tenant}/ephemeral/controlplane/kustomization.yaml (100%) rename manifests/type/{network-cloud => multi-tenant}/ephemeral/controlplane/replacements/kustomization.yaml (100%) rename manifests/type/{network-cloud => multi-tenant}/ephemeral/initinfra/kustomization.yaml (100%) rename manifests/type/{network-cloud => multi-tenant}/ephemeral/initinfra/replacements/kustomization.yaml (100%) create mode 100644 manifests/type/multi-tenant/metadata.yaml rename manifests/type/{network-cloud => multi-tenant}/phases/kustomization.yaml (100%) rename manifests/type/{network-cloud => multi-tenant}/shared/catalogues/kustomization.yaml (100%) rename manifests/type/{network-cloud => multi-tenant}/shared/catalogues/networking.yaml (100%) rename manifests/type/{network-cloud => multi-tenant}/shared/catalogues/versions.yaml (100%) rename manifests/type/{network-cloud => multi-tenant}/target/workload/kustomization.yaml (100%) delete mode 100644 manifests/type/network-cloud/README.md delete mode 100644 manifests/type/network-cloud/metadata.yaml diff --git a/manifests/site/virtual-network-cloud/ephemeral/bootstrap/kustomization.yaml b/manifests/site/virtual-network-cloud/ephemeral/bootstrap/kustomization.yaml index 14b01c394..f4b02fca4 100644 --- a/manifests/site/virtual-network-cloud/ephemeral/bootstrap/kustomization.yaml +++ b/manifests/site/virtual-network-cloud/ephemeral/bootstrap/kustomization.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../../../type/network-cloud/ephemeral/bootstrap + - ../../../../type/multi-tenant/ephemeral/bootstrap - ../catalogues generators: @@ -11,4 +11,4 @@ patchesStrategicMerge: - baremetalhost.yaml transformers: - - ../../../../type/network-cloud/ephemeral/bootstrap/replacements + - ../../../../type/multi-tenant/ephemeral/bootstrap/replacements diff --git a/manifests/site/virtual-network-cloud/ephemeral/controlplane/kustomization.yaml b/manifests/site/virtual-network-cloud/ephemeral/controlplane/kustomization.yaml index f1e61d47f..911dd9d45 100644 --- a/manifests/site/virtual-network-cloud/ephemeral/controlplane/kustomization.yaml +++ b/manifests/site/virtual-network-cloud/ephemeral/controlplane/kustomization.yaml @@ -1,10 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../../../type/network-cloud/ephemeral/controlplane + - ../../../../type/multi-tenant/ephemeral/controlplane - ../../target/catalogues # NOTE: use target networking for this phase # TODO (dukov) It's recocommended to upload BareMetalHost objects separately # otherwise nodes will hang in 'registering' state for quite a long time - nodes transformers: - - ../../../../type/network-cloud/ephemeral/controlplane/replacements + - ../../../../type/multi-tenant/ephemeral/controlplane/replacements diff --git a/manifests/site/virtual-network-cloud/ephemeral/initinfra/kustomization.yaml b/manifests/site/virtual-network-cloud/ephemeral/initinfra/kustomization.yaml index 3002826ea..25d76ec82 100644 --- a/manifests/site/virtual-network-cloud/ephemeral/initinfra/kustomization.yaml +++ b/manifests/site/virtual-network-cloud/ephemeral/initinfra/kustomization.yaml @@ -1,5 +1,5 @@ resources: - - ../../../../type/network-cloud/ephemeral/initinfra + - ../../../../type/multi-tenant/ephemeral/initinfra - ../catalogues transformers: - ../../../../type/airship-core/ephemeral/initinfra/replacements diff --git a/manifests/site/virtual-network-cloud/phases/kustomization.yaml b/manifests/site/virtual-network-cloud/phases/kustomization.yaml index a920750e6..293ad88c2 100644 --- a/manifests/site/virtual-network-cloud/phases/kustomization.yaml +++ b/manifests/site/virtual-network-cloud/phases/kustomization.yaml @@ -1,2 +1,2 @@ resources: - - ../../../type/network-cloud/phases + - ../../../type/multi-tenant/phases diff --git a/manifests/site/virtual-network-cloud/target/catalogues/kustomization.yaml b/manifests/site/virtual-network-cloud/target/catalogues/kustomization.yaml index 1e8b48ce5..b7d1f573e 100644 --- a/manifests/site/virtual-network-cloud/target/catalogues/kustomization.yaml +++ b/manifests/site/virtual-network-cloud/target/catalogues/kustomization.yaml @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../../../type/network-cloud/shared/catalogues + - ../../../../type/multi-tenant/shared/catalogues - hosts.yaml - ../generator/results diff --git a/manifests/type/multi-tenant/README.md b/manifests/type/multi-tenant/README.md new file mode 100644 index 000000000..5de9ce1a6 --- /dev/null +++ b/manifests/type/multi-tenant/README.md @@ -0,0 +1,7 @@ +# multi-tenant Type + +The multi-tenant type provides Airship configuration suitable for +performance-intensive telecommunication and networking workloads. + +A placeholder for now, the multi-tenant type will evolve to meet +the specifications of the [Cloud iNfrastructure Telco Task Force (CNTT)](https://github.com/cntt-n/CNTT). \ No newline at end of file diff --git a/manifests/type/network-cloud/ephemeral/bootstrap/kustomization.yaml b/manifests/type/multi-tenant/ephemeral/bootstrap/kustomization.yaml similarity index 100% rename from manifests/type/network-cloud/ephemeral/bootstrap/kustomization.yaml rename to manifests/type/multi-tenant/ephemeral/bootstrap/kustomization.yaml diff --git a/manifests/type/network-cloud/ephemeral/bootstrap/replacements/kustomization.yaml b/manifests/type/multi-tenant/ephemeral/bootstrap/replacements/kustomization.yaml similarity index 100% rename from manifests/type/network-cloud/ephemeral/bootstrap/replacements/kustomization.yaml rename to manifests/type/multi-tenant/ephemeral/bootstrap/replacements/kustomization.yaml diff --git a/manifests/type/network-cloud/ephemeral/controlplane/kustomization.yaml b/manifests/type/multi-tenant/ephemeral/controlplane/kustomization.yaml similarity index 100% rename from manifests/type/network-cloud/ephemeral/controlplane/kustomization.yaml rename to manifests/type/multi-tenant/ephemeral/controlplane/kustomization.yaml diff --git a/manifests/type/network-cloud/ephemeral/controlplane/replacements/kustomization.yaml b/manifests/type/multi-tenant/ephemeral/controlplane/replacements/kustomization.yaml similarity index 100% rename from manifests/type/network-cloud/ephemeral/controlplane/replacements/kustomization.yaml rename to manifests/type/multi-tenant/ephemeral/controlplane/replacements/kustomization.yaml diff --git a/manifests/type/network-cloud/ephemeral/initinfra/kustomization.yaml b/manifests/type/multi-tenant/ephemeral/initinfra/kustomization.yaml similarity index 100% rename from manifests/type/network-cloud/ephemeral/initinfra/kustomization.yaml rename to manifests/type/multi-tenant/ephemeral/initinfra/kustomization.yaml diff --git a/manifests/type/network-cloud/ephemeral/initinfra/replacements/kustomization.yaml b/manifests/type/multi-tenant/ephemeral/initinfra/replacements/kustomization.yaml similarity index 100% rename from manifests/type/network-cloud/ephemeral/initinfra/replacements/kustomization.yaml rename to manifests/type/multi-tenant/ephemeral/initinfra/replacements/kustomization.yaml diff --git a/manifests/type/multi-tenant/metadata.yaml b/manifests/type/multi-tenant/metadata.yaml new file mode 100644 index 000000000..ee7db2ca5 --- /dev/null +++ b/manifests/type/multi-tenant/metadata.yaml @@ -0,0 +1,3 @@ +phase: + docEntryPointPrefix: manifests/type/multi-tenant + path: manifests/type/multi-tenant/phases diff --git a/manifests/type/network-cloud/phases/kustomization.yaml b/manifests/type/multi-tenant/phases/kustomization.yaml similarity index 100% rename from manifests/type/network-cloud/phases/kustomization.yaml rename to manifests/type/multi-tenant/phases/kustomization.yaml diff --git a/manifests/type/network-cloud/shared/catalogues/kustomization.yaml b/manifests/type/multi-tenant/shared/catalogues/kustomization.yaml similarity index 100% rename from manifests/type/network-cloud/shared/catalogues/kustomization.yaml rename to manifests/type/multi-tenant/shared/catalogues/kustomization.yaml diff --git a/manifests/type/network-cloud/shared/catalogues/networking.yaml b/manifests/type/multi-tenant/shared/catalogues/networking.yaml similarity index 100% rename from manifests/type/network-cloud/shared/catalogues/networking.yaml rename to manifests/type/multi-tenant/shared/catalogues/networking.yaml diff --git a/manifests/type/network-cloud/shared/catalogues/versions.yaml b/manifests/type/multi-tenant/shared/catalogues/versions.yaml similarity index 100% rename from manifests/type/network-cloud/shared/catalogues/versions.yaml rename to manifests/type/multi-tenant/shared/catalogues/versions.yaml diff --git a/manifests/type/network-cloud/target/workload/kustomization.yaml b/manifests/type/multi-tenant/target/workload/kustomization.yaml similarity index 100% rename from manifests/type/network-cloud/target/workload/kustomization.yaml rename to manifests/type/multi-tenant/target/workload/kustomization.yaml diff --git a/manifests/type/network-cloud/README.md b/manifests/type/network-cloud/README.md deleted file mode 100644 index 6b69c18e3..000000000 --- a/manifests/type/network-cloud/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# Network-cloud Type - -The network type provides Airship configuration suitable for -performance-intensive telecommunication and networking workloads. A placeholder -for now, the network-cloud type will evolve to meet the specifications of the -[Cloud iNfrastructure Telco Task Force (CNTT)](https://github.com/cntt-n/CNTT). diff --git a/manifests/type/network-cloud/metadata.yaml b/manifests/type/network-cloud/metadata.yaml deleted file mode 100644 index a5a8d180f..000000000 --- a/manifests/type/network-cloud/metadata.yaml +++ /dev/null @@ -1,3 +0,0 @@ -phase: - docEntryPointPrefix: manifests/type/network-cloud - path: manifests/type/network-cloud/phases