Rename virtual sites
This commit renames virtual-network-cloud to virtual-multi-tenant. Signed-off-by: Sreejith Punnapuzha <Sreejith.Punnapuzha@outlook.com> Change-Id: I93008034f4f8bba8b2ab464d45854190b195b818
This commit is contained in:
Sreejith Punnapuzha
parent
c9f7286818
commit
fd54957eab
|
|
@ -2,4 +2,4 @@
|
||||||
.tox/
|
.tox/
|
||||||
build/
|
build/
|
||||||
|
|
||||||
manifests/site/virtual-network-cloud/ephemeral/controlplane/before.yaml
|
manifests/site/virtual-multi-tenant/ephemeral/controlplane/before.yaml
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
# Catalogue Definitions for Target Cluster
|
# Catalogue Definitions for Target Cluster
|
||||||
|
|
||||||
This inherits Site-level catalogues from the neighboring target cluster's
|
This inherits Site-level catalogues from the neighboring target cluster's
|
||||||
`catalogues` kustomization, and tweaks a few values for the ephemeral cluster.
|
`catalogues` kustomization, and tweaks a few values for the ephemeral cluster.
|
||||||
|
|
@ -14,8 +14,7 @@ spec:
|
||||||
controlPlaneEndpoint:
|
controlPlaneEndpoint:
|
||||||
host: "10.23.25.101"
|
host: "10.23.25.101"
|
||||||
apiserverCertSANs: "[10.23.25.101, 10.23.24.101]"
|
apiserverCertSANs: "[10.23.25.101, 10.23.24.101]"
|
||||||
|
|
||||||
ironic:
|
ironic:
|
||||||
provisioningIp: "10.23.24.101"
|
provisioningIp: "10.23.24.101"
|
||||||
dhcpRange: "10.23.24.200,10.23.24.250"
|
dhcpRange: "10.23.24.200,10.23.24.250"
|
||||||
|
|
||||||
|
|
@ -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
|
||||||
|
|
@ -13,4 +13,3 @@ transformers:
|
||||||
# This replaces lma-specific network data from the lma stanza
|
# This replaces lma-specific network data from the lma stanza
|
||||||
# of the subcluster-networking catalogue into the standard networking catalogue
|
# of the subcluster-networking catalogue into the standard networking catalogue
|
||||||
- ../../../../../type/multi-tenant/sub-clusters/lma/catalogue-replacements
|
- ../../../../../type/multi-tenant/sub-clusters/lma/catalogue-replacements
|
||||||
|
|
||||||
|
|
@ -13,4 +13,3 @@ transformers:
|
||||||
# This replaces wordpress-specific network data from the wordpress stanza
|
# This replaces wordpress-specific network data from the wordpress stanza
|
||||||
# of the subcluster-networking catalogue into the standard networking catalogue
|
# of the subcluster-networking catalogue into the standard networking catalogue
|
||||||
- ../../../../../type/multi-tenant/sub-clusters/wordpress/catalogue-replacements
|
- ../../../../../type/multi-tenant/sub-clusters/wordpress/catalogue-replacements
|
||||||
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
# Catalogue Definitions for Target Cluster
|
# Catalogue Definitions for Target Cluster
|
||||||
|
|
||||||
This inherits Type-level catalogues, and adds in Site-specific values.
|
This inherits Type-level catalogues, and adds in Site-specific values.
|
||||||
The neighboring ephemeral cluster's `catalogues` entrypoint applies further
|
The neighboring ephemeral cluster's `catalogues` entrypoint applies further
|
||||||
customizations on top of this for ephemeral use.
|
customizations on top of this for ephemeral use.
|
||||||
|
|
@ -76,4 +76,3 @@ hosts:
|
||||||
labels:
|
labels:
|
||||||
airshipit.org/rack: r01
|
airshipit.org/rack: r01
|
||||||
airshipit.org/server: node04
|
airshipit.org/server: node04
|
||||||
|
|
||||||
|
|
@ -17,4 +17,3 @@ spec:
|
||||||
ironic:
|
ironic:
|
||||||
provisioningIp: "10.23.24.102"
|
provisioningIp: "10.23.24.102"
|
||||||
dhcpRange: "10.23.24.200,10.23.24.250"
|
dhcpRange: "10.23.24.200,10.23.24.250"
|
||||||
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -81,10 +81,10 @@
|
||||||
voting: true
|
voting: true
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: airship-treasuremap-deploy-virtual-network-cloud
|
name: airship-treasuremap-deploy-virtual-multi-tenant
|
||||||
parent: airship-treasuremap-deploy-virtual-airship-core
|
parent: airship-treasuremap-deploy-virtual-airship-core
|
||||||
vars:
|
vars:
|
||||||
site_name: virtual-network-cloud
|
site_name: virtual-multi-tenant
|
||||||
gate_scripts:
|
gate_scripts:
|
||||||
- ./tools/deployment/multi-tenant/01_install_essentials.sh
|
- ./tools/deployment/multi-tenant/01_install_essentials.sh
|
||||||
- ./tools/deployment/multi-tenant/22_test_configs.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/360_deploy_workload.sh
|
||||||
- ./tools/deployment/multi-tenant/361_deploy_workload_config.sh
|
- ./tools/deployment/multi-tenant/361_deploy_workload_config.sh
|
||||||
files:
|
files:
|
||||||
- ^manifests/site/virtual-network-cloud/.*$
|
- ^manifests/site/virtual-multi-tenant/.*$
|
||||||
- ^manifests/type/multi-tenant/.*$
|
- ^manifests/type/multi-tenant/.*$
|
||||||
- ^manifests/function/.*$
|
- ^manifests/function/.*$
|
||||||
- ^manifests/composite/.*$
|
- ^manifests/composite/.*$
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
# - airship-treasuremap-functional-existing-k8s TODO: Enable this when functional tests exist, and a cluster is up
|
# - airship-treasuremap-functional-existing-k8s TODO: Enable this when functional tests exist, and a cluster is up
|
||||||
experimental:
|
experimental:
|
||||||
jobs:
|
jobs:
|
||||||
- airship-treasuremap-deploy-virtual-network-cloud:
|
- airship-treasuremap-deploy-virtual-multi-tenant:
|
||||||
voting: false
|
voting: false
|
||||||
|
|
||||||
post:
|
post:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue