Skip to content

Commit 7e407d3

Browse files
committed
Add OCP nodes peer_asn to BGP networking values (test eBGP)
Add peer_asn field to each worker node in network-values ConfigMap and wire kustomize replacements to set BGPPeer spec.peerASN per node. This enables CI scenarios to override peerASN per OCP worker (for eBGP testing with different ASN values). Notice no functional change, default value (64999) matches existing hardcoded peerASN. Related: OSPRH-28085 Assisted-By: Claude Signed-off-by: Maor Blaustein <mblue@redhat.com>
1 parent 5cafc8f commit 7e407d3

8 files changed

Lines changed: 80 additions & 0 deletions

File tree

examples/dt/bgp_dt01/control-plane/networking/kustomization.yaml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,62 @@ replacements:
158158
name: bgp-peer-node-6-0
159159
fieldPaths:
160160
- spec.peerAddress
161+
# BGP peer ASN per node
162+
- source:
163+
kind: ConfigMap
164+
name: network-values
165+
fieldPath: data.node_3.peer_asn
166+
targets:
167+
- select:
168+
kind: BGPPeer
169+
name: bgp-peer-node-3-0
170+
fieldPaths:
171+
- spec.peerASN
172+
- select:
173+
kind: BGPPeer
174+
name: bgp-peer-node-3-1
175+
fieldPaths:
176+
- spec.peerASN
177+
- source:
178+
kind: ConfigMap
179+
name: network-values
180+
fieldPath: data.node_4.peer_asn
181+
targets:
182+
- select:
183+
kind: BGPPeer
184+
name: bgp-peer-node-4-0
185+
fieldPaths:
186+
- spec.peerASN
187+
- select:
188+
kind: BGPPeer
189+
name: bgp-peer-node-4-1
190+
fieldPaths:
191+
- spec.peerASN
192+
- source:
193+
kind: ConfigMap
194+
name: network-values
195+
fieldPath: data.node_5.peer_asn
196+
targets:
197+
- select:
198+
kind: BGPPeer
199+
name: bgp-peer-node-5-0
200+
fieldPaths:
201+
- spec.peerASN
202+
- select:
203+
kind: BGPPeer
204+
name: bgp-peer-node-5-1
205+
fieldPaths:
206+
- spec.peerASN
207+
- source:
208+
kind: ConfigMap
209+
name: network-values
210+
fieldPath: data.node_6.peer_asn
211+
targets:
212+
- select:
213+
kind: BGPPeer
214+
name: bgp-peer-node-6-0
215+
fieldPaths:
216+
- spec.peerASN
161217
# BGP NetworkAttachmentDefinition customization
162218
- source:
163219
kind: ConfigMap

examples/dt/bgp_dt01/control-plane/networking/nncp/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ data:
1313
internalapi_ip: 172.17.0.5
1414
ctlplane_ip: 192.168.122.10
1515
storage_ip: 172.18.0.5
16+
peer_asn: 64999
1617
bgp_ip:
1718
- 100.64.0.10
1819
- 100.65.0.10
@@ -45,6 +46,7 @@ data:
4546
internalapi_ip: 172.17.0.6
4647
ctlplane_ip: 192.168.122.11
4748
storage_ip: 172.18.0.6
49+
peer_asn: 64999
4850
bgp_ip:
4951
- 100.64.1.10
5052
- 100.65.1.10
@@ -77,6 +79,7 @@ data:
7779
internalapi_ip: 172.17.0.7
7880
ctlplane_ip: 192.168.122.12
7981
storage_ip: 172.18.0.7
82+
peer_asn: 64999
8083
bgp_ip:
8184
- 100.64.2.10
8285
- 100.65.2.10
@@ -109,6 +112,7 @@ data:
109112
internalapi_ip: 172.17.0.8
110113
ctlplane_ip: 192.168.122.13
111114
storage_ip: 172.18.0.8
115+
peer_asn: 64999
112116
bgp_ip:
113117
- 100.64.10.2
114118
bgp_peers:

examples/dt/bgp_dt01/edpm/computes/r0/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ data:
2020
ansibleUser: cloud-admin
2121
ansiblePort: 22
2222
ansibleVars:
23+
edpm_nodes_validation_check_for_fqdn: false
24+
edpm_ovn_bgp_agent_reconcile_interval: 999999
2325
edpm_ovn_encap_ip: "{{ bgpmainnet_ip }}"
2426
edpm_ovn_bridge_mappings:
2527
- "datacentre:br-ex"

examples/dt/bgp_dt01/edpm/computes/r1/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ data:
2020
ansibleUser: cloud-admin
2121
ansiblePort: 22
2222
ansibleVars:
23+
edpm_nodes_validation_check_for_fqdn: false
24+
edpm_frr_bgp_asn: 64997
25+
edpm_frr_bgp_uplinks_scope: external
26+
edpm_ovn_bgp_agent_reconcile_interval: 999999
2327
edpm_ovn_encap_ip: "{{ bgpmainnet_ip }}"
2428
edpm_ovn_bridge_mappings:
2529
- "datacentre:br-ex"

examples/dt/bgp_dt01/edpm/computes/r2/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ data:
2020
ansibleUser: cloud-admin
2121
ansiblePort: 22
2222
ansibleVars:
23+
edpm_nodes_validation_check_for_fqdn: false
24+
edpm_frr_bgp_asn: 64997
25+
edpm_frr_bgp_uplinks_scope: external
26+
edpm_ovn_bgp_agent_reconcile_interval: 999999
2327
edpm_ovn_encap_ip: "{{ bgpmainnet_ip }}"
2428
edpm_ovn_bridge_mappings:
2529
- "datacentre:br-ex"

examples/dt/bgp_dt01/edpm/networkers/r0/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ data:
2020
ansibleUser: cloud-admin
2121
ansiblePort: 22
2222
ansibleVars:
23+
edpm_nodes_validation_check_for_fqdn: false
24+
edpm_ovn_bgp_agent_reconcile_interval: 999999
2325
edpm_ovn_encap_ip: "{{ bgpmainnet_ip }}"
2426
edpm_ovn_bridge_mappings:
2527
- "datacentre:br-ex"

examples/dt/bgp_dt01/edpm/networkers/r1/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ data:
2020
ansibleUser: cloud-admin
2121
ansiblePort: 22
2222
ansibleVars:
23+
edpm_nodes_validation_check_for_fqdn: false
24+
edpm_frr_bgp_asn: 64997
25+
edpm_frr_bgp_uplinks_scope: external
26+
edpm_ovn_bgp_agent_reconcile_interval: 999999
2327
edpm_ovn_encap_ip: "{{ bgpmainnet_ip }}"
2428
edpm_ovn_bridge_mappings:
2529
- "datacentre:br-ex"

examples/dt/bgp_dt01/edpm/networkers/r2/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ data:
2020
ansibleUser: cloud-admin
2121
ansiblePort: 22
2222
ansibleVars:
23+
edpm_nodes_validation_check_for_fqdn: false
24+
edpm_frr_bgp_asn: 64997
25+
edpm_frr_bgp_uplinks_scope: external
26+
edpm_ovn_bgp_agent_reconcile_interval: 999999
2327
edpm_ovn_encap_ip: "{{ bgpmainnet_ip }}"
2428
edpm_ovn_bridge_mappings:
2529
- "datacentre:br-ex"

0 commit comments

Comments
 (0)