Merge pull request #1527 from openshift-cherrypick-robot/cherry-pick-1517-to-release-4.13

openshift-merge-robot · web-flow · commit 9d009fdf0bfe · 2023-07-11T10:37:37.000-04:00
[release-4.13] OCPBUGS-14628: ztp: reduce ptp logging in all reference configs
diff --git a/feature-configs/5g-ref-nw/profile-base/du-general/ptp/ptpconfig-boundary.yaml b/feature-configs/5g-ref-nw/profile-base/du-general/ptp/ptpconfig-boundary.yaml
@@ -10,6 +10,8 @@ spec:
     phc2sysOpts: "-a -r -n 24"
     ptpSchedulingPolicy: SCHED_FIFO
     ptpSchedulingPriority: 10
+    ptpSettings:
+      logReduce: "true"
     ptp4lConf: |
       # The interface name is hardware-specific
       [ens1f0]
diff --git a/feature-configs/5g-ref-nw/profile-base/du-general/ptp/ptpconfig-grandmaster.yaml b/feature-configs/5g-ref-nw/profile-base/du-general/ptp/ptpconfig-grandmaster.yaml
@@ -14,6 +14,8 @@ spec:
     phc2sysOpts: "-a -r -r -n 24"
     ptpSchedulingPolicy: SCHED_FIFO
     ptpSchedulingPriority: 10
+    ptpSettings:
+      logReduce: "true"
     ptp4lConf: |
       [global]
       #
diff --git a/feature-configs/5g-ref-nw/profile-base/du-general/ptp/ptpconfig-slave.yaml b/feature-configs/5g-ref-nw/profile-base/du-general/ptp/ptpconfig-slave.yaml
@@ -11,6 +11,8 @@ spec:
     phc2sysOpts: "-a -r -n 24"
     ptpSchedulingPolicy: SCHED_FIFO
     ptpSchedulingPriority: 10
+    ptpSettings:
+      logReduce: "true"
     ptp4lConf: |
       [global]
       #
diff --git a/feature-configs/cn-ran-overlays/ran-profile/cluster-config/du-common/ptp/ptpconfig-boundary.yaml b/feature-configs/cn-ran-overlays/ran-profile/cluster-config/du-common/ptp/ptpconfig-boundary.yaml
@@ -10,6 +10,8 @@ spec:
     phc2sysOpts: "-a -r -n 24"
     ptpSchedulingPolicy: SCHED_FIFO
     ptpSchedulingPriority: 10
+    ptpSettings:
+      logReduce: "true"
     ptp4lConf: |
       # The interface name is hardware-specific
       [ens1f0]
diff --git a/feature-configs/cn-ran-overlays/ran-profile/cluster-config/du-common/ptp/ptpconfig-grandmaster.yaml b/feature-configs/cn-ran-overlays/ran-profile/cluster-config/du-common/ptp/ptpconfig-grandmaster.yaml
@@ -12,6 +12,8 @@ spec:
     phc2sysOpts: "-a -r -r -n 24"
     ptpSchedulingPolicy: SCHED_FIFO
     ptpSchedulingPriority: 10
+    ptpSettings:
+      logReduce: "true"
     ptp4lConf: |
       [global]
       #
diff --git a/feature-configs/cn-ran-overlays/ran-profile/cluster-config/du-common/ptp/ptpconfig-slave.yaml b/feature-configs/cn-ran-overlays/ran-profile/cluster-config/du-common/ptp/ptpconfig-slave.yaml
@@ -12,6 +12,8 @@ spec:
     phc2sysOpts: "-a -r -n 24"
     ptpSchedulingPolicy: SCHED_FIFO
     ptpSchedulingPriority: 10
+    ptpSettings:
+      logReduce: "true"
     ptp4lConf: |
       [global]
       #
diff --git a/ztp/policygenerator/testData/TestPtpConfig/sourcePolicies/TestPtpConfig.yaml b/ztp/policygenerator/testData/TestPtpConfig/sourcePolicies/TestPtpConfig.yaml
@@ -11,6 +11,8 @@ spec:
       phc2sysOpts: $phc2sysOpts
       ptpSchedulingPolicy: SCHED_FIFO
       ptpSchedulingPriority: 10
+      ptpSettings:
+        logReduce: "true"
       ptp4lConf: |
         [global]
         #
diff --git a/ztp/source-crs/PtpConfigBoundary.yaml b/ztp/source-crs/PtpConfigBoundary.yaml
@@ -12,6 +12,8 @@ spec:
     phc2sysOpts: "-a -r -n 24"
     ptpSchedulingPolicy: SCHED_FIFO
     ptpSchedulingPriority: 10
+    ptpSettings:
+      logReduce: "true"
     ptp4lConf: |
       # The interface name is hardware-specific
       [$iface_slave]
diff --git a/ztp/source-crs/PtpConfigGmWpc.yaml b/ztp/source-crs/PtpConfigGmWpc.yaml
@@ -14,6 +14,8 @@ spec:
     phc2sysOpts: -r -u 0 -m -O -37 -N 8 -R 16 -s $iface_master -n 24
     ptpSchedulingPolicy: SCHED_FIFO
     ptpSchedulingPriority: 10
+    ptpSettings:
+      logReduce: "true"
     plugins:
       e810:
         enableDefaultConfig: true
diff --git a/ztp/source-crs/PtpConfigMaster.yaml b/ztp/source-crs/PtpConfigMaster.yaml
@@ -16,6 +16,8 @@ spec:
     phc2sysOpts: "-a -r -r -n 24"
     ptpSchedulingPolicy: SCHED_FIFO
     ptpSchedulingPriority: 10
+    ptpSettings:
+      logReduce: "true"
     ptp4lConf: |
       [global]
       #
diff --git a/ztp/source-crs/PtpConfigSlave.yaml b/ztp/source-crs/PtpConfigSlave.yaml
@@ -14,6 +14,8 @@ spec:
     phc2sysOpts: "-a -r -n 24"
     ptpSchedulingPolicy: SCHED_FIFO
     ptpSchedulingPriority: 10
+    ptpSettings:
+      logReduce: "true"
     ptp4lConf: |
       [global]
       #
diff --git a/ztp/source-crs/PtpConfigSlaveCvl.yaml b/ztp/source-crs/PtpConfigSlaveCvl.yaml
@@ -15,6 +15,8 @@ spec:
     phc2sysOpts: "-a -r -n 24"
     ptpSchedulingPolicy: SCHED_FIFO
     ptpSchedulingPriority: 10
+    ptpSettings:
+      logReduce: "true"
     ptp4lConf: |
       [global]
       #

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ spec:`
`14`	`14`	`phc2sysOpts: "-a -r -r -n 24"`
`15`	`15`	`ptpSchedulingPolicy: SCHED_FIFO`
`16`	`16`	`ptpSchedulingPriority: 10`
	`17`	`+ ptpSettings:`
	`18`	`+ logReduce: "true"`
`17`	`19`	`ptp4lConf: \|`
`18`	`20`	`[global]`
`19`	`21`	`#`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ spec:`
`11`	`11`	`phc2sysOpts: "-a -r -n 24"`
`12`	`12`	`ptpSchedulingPolicy: SCHED_FIFO`
`13`	`13`	`ptpSchedulingPriority: 10`
	`14`	`+ ptpSettings:`
	`15`	`+ logReduce: "true"`
`14`	`16`	`ptp4lConf: \|`
`15`	`17`	`[global]`
`16`	`18`	`#`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ spec:`
`12`	`12`	`phc2sysOpts: "-a -r -r -n 24"`
`13`	`13`	`ptpSchedulingPolicy: SCHED_FIFO`
`14`	`14`	`ptpSchedulingPriority: 10`
	`15`	`+ ptpSettings:`
	`16`	`+ logReduce: "true"`
`15`	`17`	`ptp4lConf: \|`
`16`	`18`	`[global]`
`17`	`19`	`#`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ spec:`
`16`	`16`	`phc2sysOpts: "-a -r -r -n 24"`
`17`	`17`	`ptpSchedulingPolicy: SCHED_FIFO`
`18`	`18`	`ptpSchedulingPriority: 10`
	`19`	`+ ptpSettings:`
	`20`	`+ logReduce: "true"`
`19`	`21`	`ptp4lConf: \|`
`20`	`22`	`[global]`
`21`	`23`	`#`