reference-airship-core site manifest cleanup for 2.1

Change-Id: I7eb3325455f4f476a207f33457592af4b55c7d97
This commit is contained in:
James Gu 2021-09-27 14:44:15 -04:00 committed by James Gu
parent f819f6c510
commit 24c9696f92
9 changed files with 16 additions and 14 deletions

View File

@ -2,7 +2,6 @@
# ephemeral cluster, on top of the target cluster networking definition.
# These values can be overridden at the site, type, etc levels as appropriate.
## NEWSITE_CHANGEME: update file with ephemeral node ips
apiVersion: airshipit.org/v1alpha1
kind: NetworkCatalogue
metadata:
@ -19,12 +18,6 @@ spec:
apiserverCertSANs: "[172.64.0.12, 172.63.0.12]"
ironic:
# NEWSITE_CHANGEME: Ephemeral node PXE network
deployKernelUrl: http://172.63.0.12:80/images/ipa-ubuntu-master.kernel
deployRamdiskUrl: http://172.63.0.12:80/images/ipa-ubuntu-master.initramfs
httpPort: 6180
ironicFastTrack: "false"
ironicEndpoint: http://172.63.0.12:6385/v1/
ironicInspectorEndpoint: http://172.63.0.12:5050/v1/
provisioningInterface: "eno4"
provisioningIp: "172.63.0.12"
dhcpRange: "172.63.0.31,172.63.0.126"

View File

@ -1,7 +1,7 @@
apiVersion: airshipit.org/v1alpha1
kind: PhasePlan
metadata:
name: deploy-baremetal
name: deploy-gating
description: "Phase plan for airship-core deployment on bare metals"
phases:
# Deploy ephemeral node using redfish with iso

View File

@ -9,4 +9,5 @@ transformers:
## TODO Consider making a catalogue combined with variable substitution instead
patchesStrategicMerge:
- baremetal-plan.yaml
- phase-patch.yaml

View File

@ -1,7 +1,6 @@
# Site-level host catalogue. This info feeds the Templater
# kustomize plugin config in the hostgenerator-m3 function.
## NEWSITE_CHANGEME: update the whole file with the site specific host details
apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue
metadata:
@ -19,6 +18,8 @@ hosts:
bmcUsername: root
bmcPassword: WWTwwt1!
disableCertificateVerification: true
macAddresses:
pxe: E4:43:4B:EE:F4:CB
ipAddresses:
oam-ipv4: 10.254.125.230
pxe-ipv4: 172.63.0.11
@ -32,6 +33,8 @@ hosts:
bmcUsername: root
bmcPassword: WWTwwt1!
disableCertificateVerification: true
macAddresses:
pxe: E4:43:4B:EE:B0:43
ipAddresses:
oam-ipv4: 10.254.125.231
pxe-ipv4: 172.63.0.12
@ -46,6 +49,8 @@ hosts:
bmcUsername: root
bmcPassword: WWTwwt1!
disableCertificateVerification: true
macAddresses:
pxe: E4:43:4B:EE:D7:D9
ipAddresses:
oam-ipv4: 10.254.125.232
pxe-ipv4: 172.63.0.13
@ -60,6 +65,8 @@ hosts:
bmcUsername: root
bmcPassword: WWTwwt1!
disableCertificateVerification: true
macAddresses:
pxe: E4:43:4B:EE:DD:0F
ipAddresses:
oam-ipv4: 10.254.125.233
pxe-ipv4: 172.63.0.14
@ -74,6 +81,8 @@ hosts:
bmcUsername: root
bmcPassword: WWTwwt1!
disableCertificateVerification: true
macAddresses:
pxe: E4:43:4B:EE:D7:2F
ipAddresses:
oam-ipv4: 10.254.125.234
pxe-ipv4: 172.63.0.15
@ -88,6 +97,8 @@ hosts:
bmcUsername: root
bmcPassword: WWTwwt1!
disableCertificateVerification: true
macAddresses:
pxe: E4:43:4B:EE:F3:B7
ipAddresses:
oam-ipv4: 10.254.125.235
pxe-ipv4: 172.63.0.16

View File

@ -1,7 +1,6 @@
# This catalogue alone needs to be overriden at site level based on the
# networkign requirement like HA
## NEWSITE_CHANGEME: Update the file with the vrrp ips
apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue
metadata:

View File

@ -1,6 +1,5 @@
# Override default controlplane image location
## NEWSITE_CHANGEME: update the file with the ephemeral node pxe ip
apiVersion: airshipit.org/v1alpha1
kind: VersionsCatalogue
metadata:

View File

@ -7,4 +7,5 @@ transformers:
- ../../../../../airshipctl/manifests/function/clusterctl/replacements
## TODO Consider making a catalogue combined with variable substitution instead
patchesStrategicMerge:
- plan-patch.yaml
- phase-patch.yaml

View File

@ -162,3 +162,4 @@ validation:
- RemoteDirectConfiguration
- VariableCatalogue
- StorageCatalogue

View File

@ -4,6 +4,3 @@ resources:
- executors.yaml
- phases.yaml
- workload-config.yaml
patchesStrategicMerge:
- plan-patch.yaml