Merge pull request #1807 from jzding/2cards

ztp: OCPBUGS-28651: ptp WPC dual card set 2nd card ts2phc.master to 0

ztp/source-crs/PtpConfigDualCardGmWpc.yaml

@@ -1,7 +1,7 @@
 # The grandmaster profile is provided for testing only
 # It is not installed on production clusters
-# In this example 2 cards $iface_master and $iface_master_1 are connected via SMA1 ports by a cable
-# and $iface_master_1 receives 1PPS signals from $iface_master
+# In this example two cards $iface_nic1 and $iface_nic2 are connected via
+# SMA1 ports by a cable and $iface_nic2 receives 1PPS signals from $iface_nic1
 apiVersion: ptp.openshift.io/v1
 kind: PtpConfig
 metadata:
@@ -13,7 +13,7 @@ spec:
   profile:
   - name: "grandmaster"
     ptp4lOpts: "-2 --summary_interval -4"
-    phc2sysOpts: -r -u 0 -m -O -37 -N 8 -R 16 -s $iface_master -n 24
+    phc2sysOpts: -r -u 0 -m -O -37 -N 8 -R 16 -s $iface_nic1 -n 24
     ptpSchedulingPolicy: SCHED_FIFO
     ptpSchedulingPriority: 10
     ptpSettings:
@@ -26,12 +26,12 @@ spec:
           LocalHoldoverTimeout: 14400
           MaxInSpecOffset: 100
         pins: $e810_pins
-        #  "$iface_master":
+        #  "$iface_nic1":
         #    "U.FL2": "0 2"
         #    "U.FL1": "0 1"
         #    "SMA2": "0 2"
         #    "SMA1": "2 1"
-        #  "$iface_master_1":
+        #  "$iface_nic2":
         #    "U.FL2": "0 2"
         #    "U.FL1": "0 1"
         #    "SMA2": "0 2"
@@ -103,21 +103,30 @@ spec:
       #example value of gnss_serialport is /dev/ttyGNSS_1700_0
       ts2phc.nmea_serialport $gnss_serialport
       leapfile  /usr/share/zoneinfo/leap-seconds.list
-      [$iface_master]
+      [$iface_nic1]
       ts2phc.extts_polarity rising
       ts2phc.extts_correction 0
-      [$iface_master_1]
+      [$iface_nic2]
+      ts2phc.master 0
       ts2phc.extts_polarity rising
       #this is a measured value in nanoseconds to compensate for SMA cable delay
       ts2phc.extts_correction -10
     ptp4lConf: |
-      [$iface_master]
+      [$iface_nic1]
       masterOnly 1
-      [$iface_master_1]
+      [$iface_nic1_1]
       masterOnly 1
-      [$iface_master_1_1]
+      [$iface_nic1_2]
       masterOnly 1
-      [$iface_master_1_2]
+      [$iface_nic1_3]
+      masterOnly 1
+      [$iface_nic2]
+      masterOnly 1
+      [$iface_nic2_1]
+      masterOnly 1
+      [$iface_nic2_2]
+      masterOnly 1
+      [$iface_nic2_3]
       masterOnly 1
       [global]
       #