Added missing NEWSITE_CHANGEME and instructions
Additionally edited a few instructions of some existing NEWSUTE tag Signed-off-by: James Gu <james.gu@att.com> Change-Id: I6776f5e36ec16f307256362f8aa3720b6399246f
This commit is contained in:
parent
c9a951d2af
commit
d711c116cf
@ -6,12 +6,12 @@ metadata:
|
|||||||
labels:
|
labels:
|
||||||
airshipit.org/ephemeral-node: "true"
|
airshipit.org/ephemeral-node: "true"
|
||||||
airshipit.org/deploy-k8s: "false"
|
airshipit.org/deploy-k8s: "false"
|
||||||
## NEWSITE_CHANGEME : ephemeral node name
|
# NEWSITE_CHANGEME : ephemeral node name
|
||||||
name: stl3r01s02
|
name: stl3r01s02
|
||||||
spec:
|
spec:
|
||||||
online: true
|
online: true
|
||||||
bmc:
|
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
|
address: redfish+https://10.253.200.36/redfish/v1/Systems/System.Embedded.1
|
||||||
status:
|
status:
|
||||||
provisioning:
|
provisioning:
|
||||||
|
@ -8,16 +8,17 @@ kind: NetworkCatalogue
|
|||||||
metadata:
|
metadata:
|
||||||
name: networking
|
name: networking
|
||||||
spec:
|
spec:
|
||||||
# The catalogue should be overridden as appropriate for different kubernetes
|
|
||||||
# clusters, e.g. ephemeral vs target vs tenant
|
|
||||||
kubernetes:
|
kubernetes:
|
||||||
serviceCidr: "10.96.0.0/12"
|
serviceCidr: "10.96.0.0/12"
|
||||||
podCidr: "192.168.0.0/18"
|
podCidr: "192.168.0.0/18"
|
||||||
controlPlaneEndpoint:
|
controlPlaneEndpoint:
|
||||||
|
# NEWSITE_CHANGEME: Ephemeral node oam ip
|
||||||
host: "10.254.125.231"
|
host: "10.254.125.231"
|
||||||
port: 6443
|
port: 6443
|
||||||
|
# NEWSITE_CHANGEME: ephemeral node calico ip and pxe ip
|
||||||
apiserverCertSANs: "[172.64.0.12, 172.63.0.12]"
|
apiserverCertSANs: "[172.64.0.12, 172.63.0.12]"
|
||||||
ironic:
|
ironic:
|
||||||
|
# NEWSITE_CHANGEME: Ephemeral node PXE network
|
||||||
provisioningInterface: "eno4"
|
provisioningInterface: "eno4"
|
||||||
provisioningIp: "172.63.0.12"
|
provisioningIp: "172.63.0.12"
|
||||||
dhcpRange: "172.63.0.31,172.63.0.126"
|
dhcpRange: "172.63.0.31,172.63.0.126"
|
||||||
|
@ -10,6 +10,7 @@ metadata:
|
|||||||
airshipit.org/deploy-k8s: "false"
|
airshipit.org/deploy-k8s: "false"
|
||||||
|
|
||||||
hosts:
|
hosts:
|
||||||
|
# NEWSITE_CHANGEME: update with the site specific host details for all hosts
|
||||||
m3:
|
m3:
|
||||||
stl3r01s01:
|
stl3r01s01:
|
||||||
bootMode: legacy
|
bootMode: legacy
|
||||||
|
@ -9,9 +9,11 @@ metadata:
|
|||||||
labels:
|
labels:
|
||||||
airshipit.org/deploy-k8s: "false"
|
airshipit.org/deploy-k8s: "false"
|
||||||
vrrp:
|
vrrp:
|
||||||
|
# NEWSITE_CHANGEME: Update kubernetes virtual ip and OAM interface
|
||||||
kubernetes:
|
kubernetes:
|
||||||
interface: bond0.61
|
interface: bond0.61
|
||||||
virtual_ipaddress: 10.254.125.239
|
virtual_ipaddress: 10.254.125.239
|
||||||
|
# NEWSITE_CHANGEME: Update ingress virtual ip and OAM interface
|
||||||
ingress:
|
ingress:
|
||||||
interface: bond0.61
|
interface: bond0.61
|
||||||
virtual_ipaddress: 10.254.125.240
|
virtual_ipaddress: 10.254.125.240
|
||||||
|
@ -2,8 +2,6 @@
|
|||||||
# ephemeral cluster, on top of the target cluster networking definition.
|
# ephemeral cluster, on top of the target cluster networking definition.
|
||||||
# These values can be overridden at the site, type, etc levels as appropriate.
|
# 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
|
apiVersion: airshipit.org/v1alpha1
|
||||||
kind: NetworkCatalogue
|
kind: NetworkCatalogue
|
||||||
metadata:
|
metadata:
|
||||||
@ -16,26 +14,29 @@ spec:
|
|||||||
serviceCidr: "10.96.0.0/12"
|
serviceCidr: "10.96.0.0/12"
|
||||||
podCidr: "192.168.0.0/18"
|
podCidr: "192.168.0.0/18"
|
||||||
controlPlaneEndpoint:
|
controlPlaneEndpoint:
|
||||||
## NEWSITE_CHANGEME: below is the vrrp kubernetes ip
|
# NEWSITE_CHANGEME: below is the vrrp kubernetes virtual ip
|
||||||
host: "10.254.125.239"
|
host: "10.254.125.239"
|
||||||
port: 6443
|
port: 6443
|
||||||
|
# NEWSITE_CHANGEME: first controller node calico ip and pxe ip
|
||||||
apiserverCertSANs: "[172.64.0.11, 172.63.0.11]"
|
apiserverCertSANs: "[172.64.0.11, 172.63.0.11]"
|
||||||
ironic:
|
ironic:
|
||||||
|
# NEWSITE_CHANGEME: update the first controller node PXE network information
|
||||||
provisioningInterface: "eno4"
|
provisioningInterface: "eno4"
|
||||||
provisioningIp: "172.63.0.11"
|
provisioningIp: "172.63.0.11"
|
||||||
dhcpRange: "172.63.0.31,172.63.0.126"
|
dhcpRange: "172.63.0.31,172.63.0.126"
|
||||||
commonHostNetworking:
|
commonHostNetworking:
|
||||||
links:
|
links:
|
||||||
|
# NEWSITE_CHANGEME: PXE network, untagged
|
||||||
- id: eno4
|
- id: eno4
|
||||||
name: eno4
|
name: eno4
|
||||||
type: phy
|
type: phy
|
||||||
mtu: "1500"
|
mtu: "1500"
|
||||||
# ethernet_mac_address: <from host-catalogue> (optional)
|
# NEWSITE_CHANGEME: 25G Intel XXV710DA2 NIC 1 port 2; the first NIC in the bonded interface
|
||||||
- id: enp94s0f1
|
- id: enp94s0f1
|
||||||
name: enp94s0f1
|
name: enp94s0f1
|
||||||
type: phy
|
type: phy
|
||||||
mtu: "9100"
|
mtu: "9100"
|
||||||
# ethernet_mac_address: <from host-catalogue> (optional)
|
# NEWSITE_CHANGEME: 25G Intel XXV710DA2 NIC 2 port 1; the second NIC in the bonded interface
|
||||||
- id: enp134s0f0
|
- id: enp134s0f0
|
||||||
name: enp134s0f0
|
name: enp134s0f0
|
||||||
type: phy
|
type: phy
|
||||||
@ -43,11 +44,13 @@ spec:
|
|||||||
- id: bond0
|
- id: bond0
|
||||||
name: bond0
|
name: bond0
|
||||||
type: bond
|
type: bond
|
||||||
|
# NEWSITE_CHANGEME: update the bond link interface name
|
||||||
bond_links: ["enp94s0f1", "enp134s0f0"]
|
bond_links: ["enp94s0f1", "enp134s0f0"]
|
||||||
bond_mode: 802.3ad
|
bond_mode: 802.3ad
|
||||||
bond_xmit_hash_policy: layer3+4
|
bond_xmit_hash_policy: layer3+4
|
||||||
bond_miimon: 100
|
bond_miimon: 100
|
||||||
mtu: 9100
|
mtu: 9100
|
||||||
|
# NEWSITE_CHANGEME: OAM network
|
||||||
- id: bond0.61
|
- id: bond0.61
|
||||||
name: bond0.61
|
name: bond0.61
|
||||||
type: vlan
|
type: vlan
|
||||||
@ -55,6 +58,7 @@ spec:
|
|||||||
vlan_id: 61
|
vlan_id: 61
|
||||||
mtu: 9100
|
mtu: 9100
|
||||||
vlan_mac_address: null
|
vlan_mac_address: null
|
||||||
|
# NEWSITE_CHANGEME: Storage network
|
||||||
- id: bond0.62
|
- id: bond0.62
|
||||||
name: bond0.62
|
name: bond0.62
|
||||||
type: vlan
|
type: vlan
|
||||||
@ -62,6 +66,7 @@ spec:
|
|||||||
vlan_id: 62
|
vlan_id: 62
|
||||||
mtu: 9100
|
mtu: 9100
|
||||||
vlan_mac_address: null
|
vlan_mac_address: null
|
||||||
|
# NEWSITE_CHANGEME: Calico network
|
||||||
- id: bond0.64
|
- id: bond0.64
|
||||||
name: bond0.64
|
name: bond0.64
|
||||||
type: vlan
|
type: vlan
|
||||||
@ -69,6 +74,7 @@ spec:
|
|||||||
vlan_id: 64
|
vlan_id: 64
|
||||||
mtu: 9100
|
mtu: 9100
|
||||||
vlan_mac_address: null
|
vlan_mac_address: null
|
||||||
|
# unused for now
|
||||||
- id: bond0.65
|
- id: bond0.65
|
||||||
name: bond0.65
|
name: bond0.65
|
||||||
type: vlan
|
type: vlan
|
||||||
@ -77,6 +83,7 @@ spec:
|
|||||||
mtu: 9100
|
mtu: 9100
|
||||||
vlan_mac_address: null
|
vlan_mac_address: null
|
||||||
networks:
|
networks:
|
||||||
|
# NEWSITE_CHANGEME: OAM network
|
||||||
- id: oam-ipv4
|
- id: oam-ipv4
|
||||||
type: ipv4
|
type: ipv4
|
||||||
link: bond0.61
|
link: bond0.61
|
||||||
@ -86,25 +93,28 @@ spec:
|
|||||||
- network: 0.0.0.0
|
- network: 0.0.0.0
|
||||||
netmask: 0.0.0.0
|
netmask: 0.0.0.0
|
||||||
gateway: 10.254.125.225
|
gateway: 10.254.125.225
|
||||||
|
# NEWSITE_CHANGEME: PXE network
|
||||||
- id: pxe-ipv4
|
- id: pxe-ipv4
|
||||||
type: ipv4
|
type: ipv4
|
||||||
link: eno4
|
link: eno4
|
||||||
# ip_address: <from host-catalogue>
|
# ip_address: <from host-catalogue>
|
||||||
netmask: 255.255.255.128
|
netmask: 255.255.255.128
|
||||||
|
# NEWSITE_CHANGEME: Storage network
|
||||||
- id: storage-ipv4
|
- id: storage-ipv4
|
||||||
type: ipv4
|
type: ipv4
|
||||||
link: bond0.62
|
link: bond0.62
|
||||||
# ip_address:
|
# ip_address:
|
||||||
netmask: 255.255.255.128
|
netmask: 255.255.255.128
|
||||||
|
# NEWSITE_CHANGEME: Calico network
|
||||||
- id: calico-ipv4
|
- id: calico-ipv4
|
||||||
type: ipv4
|
type: ipv4
|
||||||
link: bond0.64
|
link: bond0.64
|
||||||
# ip_address:
|
# ip_address:
|
||||||
netmask: 255.255.255.128
|
netmask: 255.255.255.128
|
||||||
services:
|
services:
|
||||||
|
# NEWSITE_CHANGEME: DNS servers
|
||||||
- address: 8.8.8.8
|
- address: 8.8.8.8
|
||||||
type: dns
|
type: dns
|
||||||
- address: 8.8.4.4
|
- address: 8.8.4.4
|
||||||
type: dns
|
type: dns
|
||||||
|
|
||||||
|
|
||||||
|
@ -10,6 +10,7 @@ spec:
|
|||||||
files:
|
files:
|
||||||
k8scontrol:
|
k8scontrol:
|
||||||
# Host the image in a locally served location for CI
|
# Host the image in a locally served location for CI
|
||||||
|
# NEWSITE_CHANGEME: update the url with the ephemeral node pxe ip
|
||||||
cluster_controlplane_image:
|
cluster_controlplane_image:
|
||||||
url: http://172.63.0.12/images/control-plane.qcow2
|
url: http://172.63.0.12/images/control-plane.qcow2
|
||||||
checksum: http://172.63.0.12/images/control-plane.qcow2.md5sum
|
checksum: http://172.63.0.12/images/control-plane.qcow2.md5sum
|
||||||
|
Loading…
Reference in New Issue
Block a user