Skip to content

Commit 4acab95

Browse files
authored
Merge pull request #93763 from rohennes/TELCODOCS-2289-4-17-CP
[enterprise-4.17] TELCDOCS-2289-4-16+: Adding 3-card NIC to RDS for 4.16 and all later RDS versions
2 parents 4f00416 + 95395a7 commit 4acab95

7 files changed

+276
-77
lines changed

modules/telco-ran-crs-day-2-operators.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ PTP fast event notifications,xref:../../telco_ref_design_specs/ran/telco-ran-ref
4040
PTP Operator - high availability,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigboundary-yaml[PtpConfigBoundary.yaml],No,No
4141
PTP Operator - high availability,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigforha-yaml[PtpConfigForHA.yaml],No,No
4242
PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigdualcardgmwpc-yaml[PtpConfigDualCardGmWpc.yaml],No,No
43+
PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigthreecardgmwpc-yaml[PtpConfigThreeCardGmWpc.yaml],No,No
4344
PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfiggmwpc-yaml[PtpConfigGmWpc.yaml],No,No
4445
PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigslave-yaml[PtpConfigSlave.yaml],No,No
4546
PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpoperatorconfig-yaml[PtpOperatorConfig.yaml],No,No

modules/telco-ran-yaml-ref-day-2-operators.adoc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,13 @@ include::snippets/ztp_PtpConfigForHA.yaml[]
216216
include::snippets/ztp_PtpConfigDualCardGmWpc.yaml[]
217217
----
218218

219+
[id="ztp-ptpconfigthreecardgmwpc-yaml"]
220+
.PtpConfigThreeCardGmWpc.yaml
221+
[source,yaml]
222+
----
223+
include::snippets/ztp_PtpConfigThreeCardGmWpc.yaml[]
224+
----
225+
219226
[id="ztp-ptpconfiggmwpc-yaml"]
220227
.PtpConfigGmWpc.yaml
221228
[source,yaml]

modules/ztp-recommended-cluster-mc-crs.adoc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,7 @@ a|`03-sctp-machine-config-master.yaml`
2626
`03-sctp-machine-config-worker.yaml`
2727
|Loads the SCTP kernel module. These `MachineConfig` CRs are optional and can be omitted if you do not require this kernel module.
2828

29-
a|`05-kdump-config-master.yaml`
30-
31-
`05-kdump-config-worker.yaml`
32-
33-
`06-kdump-master.yaml`
29+
a|`06-kdump-master.yaml`
3430

3531
`06-kdump-worker.yaml`
3632
|Configures kdump crash reporting for the cluster.

modules/ztp-sno-du-enabling-kdump.adoc

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,12 @@
88

99
`kdump` is a Linux kernel feature that creates a kernel crash dump when the kernel crashes. `kdump` is enabled with the following `MachineConfig` CRs.
1010

11-
.Recommended `MachineConfig` CR to remove ice driver from control plane kdump logs (`05-kdump-config-master.yaml`)
12-
[source,yaml]
13-
----
14-
include::snippets/ztp_05-kdump-config-master.yaml[]
15-
----
16-
1711
.Recommended control plane node kdump configuration (`06-kdump-master.yaml`)
1812
[source,yaml]
1913
----
2014
include::snippets/ztp_06-kdump-master.yaml[]
2115
----
2216

23-
.Recommended `MachineConfig` CR to remove ice driver from worker node kdump logs (`05-kdump-config-worker.yaml`)
24-
[source,yaml]
25-
----
26-
include::snippets/ztp_05-kdump-config-worker.yaml[]
27-
----
28-
2917
.Recommended kdump worker node configuration (`06-kdump-worker.yaml`)
3018
[source,yaml]
3119
----

snippets/ztp_05-kdump-config-master.yaml

Lines changed: 0 additions & 30 deletions
This file was deleted.

snippets/ztp_05-kdump-config-worker.yaml

Lines changed: 0 additions & 30 deletions
This file was deleted.
Lines changed: 267 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,267 @@
1+
# In this example, the three cards are connected via SMA cables:
2+
# - $$iface_nic1 has the GNSS signal input
3+
# - $$iface_nic2 SMA1 is connected to $$iface_nic1 SMA1
4+
# - $$iface_nic3 SMA1 is connected to $$iface_nic1 SMA2
5+
apiVersion: ptp.openshift.io/v1
6+
kind: PtpConfig
7+
metadata:
8+
name: grandmaster
9+
namespace: openshift-ptp
10+
annotations:
11+
{}
12+
spec:
13+
profile:
14+
- name: grandmaster
15+
ptp4lOpts: -2 --summary_interval -4
16+
phc2sysOpts: -r -u 0 -m -N 8 -R 16 -s $$iface_nic1 -n 24
17+
ptpSchedulingPolicy: SCHED_FIFO
18+
ptpSchedulingPriority: 10
19+
ptpSettings:
20+
logReduce: "true"
21+
plugins:
22+
e810:
23+
enableDefaultConfig: false
24+
settings:
25+
LocalHoldoverTimeout: 14400
26+
LocalMaxHoldoverOffSet: 1500
27+
MaxInSpecOffset: 1500
28+
pins:
29+
# Syntax guide:
30+
# - The 1st number in each pair must be one of:
31+
# 0 - Disabled
32+
# 1 - RX
33+
# 2 - TX
34+
# - The 2nd number in each pair must match the channel number
35+
$$iface_nic1:
36+
SMA1: 2 1
37+
SMA2: 2 2
38+
U.FL1: 0 1
39+
U.FL2: 0 2
40+
$$iface_nic2:
41+
SMA1: 1 1
42+
SMA2: 0 2
43+
U.FL1: 0 1
44+
U.FL2: 0 2
45+
$$iface_nic3:
46+
SMA1: 1 1
47+
SMA2: 0 2
48+
U.FL1: 0 1
49+
U.FL2: 0 2
50+
ublxCmds:
51+
- args: #ubxtool -P 29.20 -z CFG-HW-ANT_CFG_VOLTCTRL,1
52+
- "-P"
53+
- "29.20"
54+
- "-z"
55+
- "CFG-HW-ANT_CFG_VOLTCTRL,1"
56+
reportOutput: false
57+
- args: #ubxtool -P 29.20 -e GPS
58+
- "-P"
59+
- "29.20"
60+
- "-e"
61+
- "GPS"
62+
reportOutput: false
63+
- args: #ubxtool -P 29.20 -d Galileo
64+
- "-P"
65+
- "29.20"
66+
- "-d"
67+
- "Galileo"
68+
reportOutput: false
69+
- args: #ubxtool -P 29.20 -d GLONASS
70+
- "-P"
71+
- "29.20"
72+
- "-d"
73+
- "GLONASS"
74+
reportOutput: false
75+
- args: #ubxtool -P 29.20 -d BeiDou
76+
- "-P"
77+
- "29.20"
78+
- "-d"
79+
- "BeiDou"
80+
reportOutput: false
81+
- args: #ubxtool -P 29.20 -d SBAS
82+
- "-P"
83+
- "29.20"
84+
- "-d"
85+
- "SBAS"
86+
reportOutput: false
87+
- args: #ubxtool -P 29.20 -t -w 5 -v 1 -e SURVEYIN,600,50000
88+
- "-P"
89+
- "29.20"
90+
- "-t"
91+
- "-w"
92+
- "5"
93+
- "-v"
94+
- "1"
95+
- "-e"
96+
- "SURVEYIN,600,50000"
97+
reportOutput: true
98+
- args: #ubxtool -P 29.20 -p MON-HW
99+
- "-P"
100+
- "29.20"
101+
- "-p"
102+
- "MON-HW"
103+
reportOutput: true
104+
- args: #ubxtool -P 29.20 -p CFG-MSG,1,38,248
105+
- "-P"
106+
- "29.20"
107+
- "-p"
108+
- "CFG-MSG,1,38,248"
109+
reportOutput: true
110+
ts2phcOpts: " "
111+
ts2phcConf: |
112+
[nmea]
113+
ts2phc.master 1
114+
[global]
115+
use_syslog 0
116+
verbose 1
117+
logging_level 7
118+
ts2phc.pulsewidth 100000000
119+
#example value of nmea_serialport is /dev/gnss0
120+
ts2phc.nmea_serialport (?<gnss_serialport>[/\w\s/]+)
121+
leapfile /usr/share/zoneinfo/leap-seconds.list
122+
[$$iface_nic1]
123+
ts2phc.extts_polarity rising
124+
ts2phc.extts_correction 0
125+
[$$iface_nic2]
126+
ts2phc.master 0
127+
ts2phc.extts_polarity rising
128+
#this is a measured value in nanoseconds to compensate for SMA cable delay
129+
ts2phc.extts_correction -10
130+
[$$iface_nic3]
131+
ts2phc.master 0
132+
ts2phc.extts_polarity rising
133+
#this is a measured value in nanoseconds to compensate for SMA cable delay
134+
ts2phc.extts_correction -10
135+
ptp4lConf: |
136+
[$$iface_nic1]
137+
masterOnly 1
138+
[$$iface_nic1_1]
139+
masterOnly 1
140+
[$$iface_nic1_2]
141+
masterOnly 1
142+
[$$iface_nic1_3]
143+
masterOnly 1
144+
[$$iface_nic2]
145+
masterOnly 1
146+
[$$iface_nic2_1]
147+
masterOnly 1
148+
[$$iface_nic2_2]
149+
masterOnly 1
150+
[$$iface_nic2_3]
151+
masterOnly 1
152+
[$$iface_nic3]
153+
masterOnly 1
154+
[$$iface_nic3_1]
155+
masterOnly 1
156+
[$$iface_nic3_2]
157+
masterOnly 1
158+
[$$iface_nic3_3]
159+
masterOnly 1
160+
[global]
161+
#
162+
# Default Data Set
163+
#
164+
twoStepFlag 1
165+
priority1 128
166+
priority2 128
167+
domainNumber 24
168+
#utc_offset 37
169+
clockClass 6
170+
clockAccuracy 0x27
171+
offsetScaledLogVariance 0xFFFF
172+
free_running 0
173+
freq_est_interval 1
174+
dscp_event 0
175+
dscp_general 0
176+
dataset_comparison G.8275.x
177+
G.8275.defaultDS.localPriority 128
178+
#
179+
# Port Data Set
180+
#
181+
logAnnounceInterval -3
182+
logSyncInterval -4
183+
logMinDelayReqInterval -4
184+
logMinPdelayReqInterval 0
185+
announceReceiptTimeout 3
186+
syncReceiptTimeout 0
187+
delayAsymmetry 0
188+
fault_reset_interval -4
189+
neighborPropDelayThresh 20000000
190+
masterOnly 0
191+
G.8275.portDS.localPriority 128
192+
#
193+
# Run time options
194+
#
195+
assume_two_step 0
196+
logging_level 6
197+
path_trace_enabled 0
198+
follow_up_info 0
199+
hybrid_e2e 0
200+
inhibit_multicast_service 0
201+
net_sync_monitor 0
202+
tc_spanning_tree 0
203+
tx_timestamp_timeout 50
204+
unicast_listen 0
205+
unicast_master_table 0
206+
unicast_req_duration 3600
207+
use_syslog 1
208+
verbose 0
209+
summary_interval -4
210+
kernel_leap 1
211+
check_fup_sync 0
212+
clock_class_threshold 7
213+
#
214+
# Servo Options
215+
#
216+
pi_proportional_const 0.0
217+
pi_integral_const 0.0
218+
pi_proportional_scale 0.0
219+
pi_proportional_exponent -0.3
220+
pi_proportional_norm_max 0.7
221+
pi_integral_scale 0.0
222+
pi_integral_exponent 0.4
223+
pi_integral_norm_max 0.3
224+
step_threshold 2.0
225+
first_step_threshold 0.00002
226+
clock_servo pi
227+
sanity_freq_limit 200000000
228+
ntpshm_segment 0
229+
#
230+
# Transport options
231+
#
232+
transportSpecific 0x0
233+
ptp_dst_mac 01:1B:19:00:00:00
234+
p2p_dst_mac 01:80:C2:00:00:0E
235+
udp_ttl 1
236+
udp6_scope 0x0E
237+
uds_address /var/run/ptp4l
238+
#
239+
# Default interface options
240+
#
241+
clock_type BC
242+
network_transport L2
243+
delay_mechanism E2E
244+
time_stamping hardware
245+
tsproc_mode filter
246+
delay_filter moving_median
247+
delay_filter_length 10
248+
egressLatency 0
249+
ingressLatency 0
250+
boundary_clock_jbod 1
251+
#
252+
# Clock description
253+
#
254+
productDescription ;;
255+
revisionData ;;
256+
manufacturerIdentity 00:00:00
257+
userDescription ;
258+
timeSource 0x20
259+
ptpClockThreshold:
260+
holdOverTimeout: 5
261+
maxOffsetThreshold: 100
262+
minOffsetThreshold: -100
263+
recommend:
264+
- profile: grandmaster
265+
priority: 4
266+
match:
267+
- nodeLabel: node-role.kubernetes.io/$mcp

0 commit comments

Comments
 (0)