diff --git a/manifests/site/reference-airship-core/ephemeral/bootstrap/baremetalhost.yaml b/manifests/site/reference-airship-core/ephemeral/bootstrap/baremetalhost.yaml index 0f581c1dc..e88f98a7c 100644 --- a/manifests/site/reference-airship-core/ephemeral/bootstrap/baremetalhost.yaml +++ b/manifests/site/reference-airship-core/ephemeral/bootstrap/baremetalhost.yaml @@ -6,12 +6,12 @@ metadata: labels: airshipit.org/ephemeral-node: "true" airshipit.org/deploy-k8s: "false" - ## NEWSITE_CHANGEME : ephemeral node name + # NEWSITE_CHANGEME : ephemeral node name name: stl3r01s02 spec: online: true bmc: - ## NEWSITE_CHANGEME: ephemeral node redhish api endpoint + # NEWSITE_CHANGEME: ephemeral node redhish api endpoint address: redfish+https://10.253.200.36/redfish/v1/Systems/System.Embedded.1 status: provisioning: diff --git a/manifests/site/reference-airship-core/ephemeral/catalogues/networking.yaml b/manifests/site/reference-airship-core/ephemeral/catalogues/networking.yaml index 5d7176f12..4f006d734 100644 --- a/manifests/site/reference-airship-core/ephemeral/catalogues/networking.yaml +++ b/manifests/site/reference-airship-core/ephemeral/catalogues/networking.yaml @@ -8,16 +8,17 @@ kind: NetworkCatalogue metadata: name: networking spec: - # The catalogue should be overridden as appropriate for different kubernetes - # clusters, e.g. ephemeral vs target vs tenant kubernetes: serviceCidr: "10.96.0.0/12" podCidr: "192.168.0.0/18" controlPlaneEndpoint: + # NEWSITE_CHANGEME: Ephemeral node oam ip host: "10.254.125.231" port: 6443 + # NEWSITE_CHANGEME: ephemeral node calico ip and pxe ip apiserverCertSANs: "[172.64.0.12, 172.63.0.12]" ironic: + # NEWSITE_CHANGEME: Ephemeral node PXE network provisioningInterface: "eno4" provisioningIp: "172.63.0.12" dhcpRange: "172.63.0.31,172.63.0.126" diff --git a/manifests/site/reference-airship-core/target/catalogues/hosts.yaml b/manifests/site/reference-airship-core/target/catalogues/hosts.yaml index e857fe5a6..b0a39c666 100644 --- a/manifests/site/reference-airship-core/target/catalogues/hosts.yaml +++ b/manifests/site/reference-airship-core/target/catalogues/hosts.yaml @@ -10,6 +10,7 @@ metadata: airshipit.org/deploy-k8s: "false" hosts: + # NEWSITE_CHANGEME: update with the site specific host details for all hosts m3: stl3r01s01: bootMode: legacy diff --git a/manifests/site/reference-airship-core/target/catalogues/networking-ha.yaml b/manifests/site/reference-airship-core/target/catalogues/networking-ha.yaml index 3690125a2..305bee7a1 100644 --- a/manifests/site/reference-airship-core/target/catalogues/networking-ha.yaml +++ b/manifests/site/reference-airship-core/target/catalogues/networking-ha.yaml @@ -9,9 +9,11 @@ metadata: labels: airshipit.org/deploy-k8s: "false" vrrp: + # NEWSITE_CHANGEME: Update kubernetes virtual ip and OAM interface kubernetes: interface: bond0.61 virtual_ipaddress: 10.254.125.239 + # NEWSITE_CHANGEME: Update ingress virtual ip and OAM interface ingress: interface: bond0.61 virtual_ipaddress: 10.254.125.240 diff --git a/manifests/site/reference-airship-core/target/catalogues/networking.yaml b/manifests/site/reference-airship-core/target/catalogues/networking.yaml index e76c7ef60..974216d52 100644 --- a/manifests/site/reference-airship-core/target/catalogues/networking.yaml +++ b/manifests/site/reference-airship-core/target/catalogues/networking.yaml @@ -2,8 +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 the file with the first target node networking informatiom. -## assumption is all hosts share the same networking profile apiVersion: airshipit.org/v1alpha1 kind: NetworkCatalogue metadata: @@ -16,26 +14,29 @@ spec: serviceCidr: "10.96.0.0/12" podCidr: "192.168.0.0/18" controlPlaneEndpoint: - ## NEWSITE_CHANGEME: below is the vrrp kubernetes ip + # NEWSITE_CHANGEME: below is the vrrp kubernetes virtual ip host: "10.254.125.239" port: 6443 + # NEWSITE_CHANGEME: first controller node calico ip and pxe ip apiserverCertSANs: "[172.64.0.11, 172.63.0.11]" ironic: + # NEWSITE_CHANGEME: update the first controller node PXE network information provisioningInterface: "eno4" provisioningIp: "172.63.0.11" dhcpRange: "172.63.0.31,172.63.0.126" commonHostNetworking: links: + # NEWSITE_CHANGEME: PXE network, untagged - id: eno4 name: eno4 type: phy mtu: "1500" - # ethernet_mac_address: (optional) + # NEWSITE_CHANGEME: 25G Intel XXV710DA2 NIC 1 port 2; the first NIC in the bonded interface - id: enp94s0f1 name: enp94s0f1 type: phy mtu: "9100" - # ethernet_mac_address: (optional) + # NEWSITE_CHANGEME: 25G Intel XXV710DA2 NIC 2 port 1; the second NIC in the bonded interface - id: enp134s0f0 name: enp134s0f0 type: phy @@ -43,11 +44,13 @@ spec: - id: bond0 name: bond0 type: bond + # NEWSITE_CHANGEME: update the bond link interface name bond_links: ["enp94s0f1", "enp134s0f0"] bond_mode: 802.3ad bond_xmit_hash_policy: layer3+4 bond_miimon: 100 mtu: 9100 + # NEWSITE_CHANGEME: OAM network - id: bond0.61 name: bond0.61 type: vlan @@ -55,6 +58,7 @@ spec: vlan_id: 61 mtu: 9100 vlan_mac_address: null + # NEWSITE_CHANGEME: Storage network - id: bond0.62 name: bond0.62 type: vlan @@ -62,6 +66,7 @@ spec: vlan_id: 62 mtu: 9100 vlan_mac_address: null + # NEWSITE_CHANGEME: Calico network - id: bond0.64 name: bond0.64 type: vlan @@ -69,6 +74,7 @@ spec: vlan_id: 64 mtu: 9100 vlan_mac_address: null + # unused for now - id: bond0.65 name: bond0.65 type: vlan @@ -77,6 +83,7 @@ spec: mtu: 9100 vlan_mac_address: null networks: + # NEWSITE_CHANGEME: OAM network - id: oam-ipv4 type: ipv4 link: bond0.61 @@ -86,25 +93,28 @@ spec: - network: 0.0.0.0 netmask: 0.0.0.0 gateway: 10.254.125.225 + # NEWSITE_CHANGEME: PXE network - id: pxe-ipv4 type: ipv4 link: eno4 # ip_address: netmask: 255.255.255.128 + # NEWSITE_CHANGEME: Storage network - id: storage-ipv4 type: ipv4 link: bond0.62 # ip_address: netmask: 255.255.255.128 + # NEWSITE_CHANGEME: Calico network - id: calico-ipv4 type: ipv4 link: bond0.64 # ip_address: netmask: 255.255.255.128 services: + # NEWSITE_CHANGEME: DNS servers - address: 8.8.8.8 type: dns - address: 8.8.4.4 type: dns - diff --git a/manifests/site/reference-airship-core/target/catalogues/versions-airshipctl.yaml b/manifests/site/reference-airship-core/target/catalogues/versions-airshipctl.yaml index d87dc38f7..a948d69a6 100644 --- a/manifests/site/reference-airship-core/target/catalogues/versions-airshipctl.yaml +++ b/manifests/site/reference-airship-core/target/catalogues/versions-airshipctl.yaml @@ -10,6 +10,7 @@ spec: files: k8scontrol: # Host the image in a locally served location for CI + # NEWSITE_CHANGEME: update the url with the ephemeral node pxe ip cluster_controlplane_image: url: http://172.63.0.12/images/control-plane.qcow2 checksum: http://172.63.0.12/images/control-plane.qcow2.md5sum