Disable PHC sanity check in case of software PTP mode.

boundary_clock_jbod performs a sanity check to make sure
that all of the ports share the same hardware clock device.
This option is not needed in case of software PTP mode.
Moreover it interferes with normal PTP operation in this
case and causes PTP clocks instability in a network.

Also, cleaning up unused pmon scripts for ptp4l and phc2sys
and adding services dependencies from mainline linuxptp.

Change-Id: If4bbe6af600dbdf38d301deafb7dc050a7754cad
Closes-bug: 1824218
Signed-off-by: Alex Kozyrev <alex.kozyrev@windriver.com>

puppet-manifests/centos/build_srpm.data

@@ -1,2 +1,2 @@
 SRC_DIR="src"
-TIS_PATCH_VER=86
+TIS_PATCH_VER=87

puppet-manifests/src/modules/platform/templates/phc2sys.pmon.conf.erb

@@ -1,19 +0,0 @@
-[process]
-process  = phc2sys
-service  = phc2sys
-pidfile  = /var/run/phc2sys.pid
-style    = lsb            ; ocf or lsb
-severity = minor          ; minor, major, critical
-restarts = 0              ; restart retries before error assertion
-interval = 10             ; number of seconds to wait between restarts
-debounce = 10             ; number of seconds that a process needs to remain
-                          ;   running before degrade is removed and retry count
-                          ;   is cleared.
-; These settings will generate a log only without attempting to restart
-; pmond will put the process into an ignore state after failure.
-
-startuptime  = 180        ; Seconds to wait after process start before starting the debounce monitor
-mode  = passive           ; Monitoring mode: passive (default) or active
-                          ; passive: process death monitoring (default: always)
-                          ; active : heartbeat monitoring, i.e. request / response messaging
-                          ; ignore : do not monitor or stop monitoring

puppet-manifests/src/modules/platform/templates/phc2sys.service.erb

@@ -1,5 +1,6 @@
 [Unit]
 Description=Synchronize system clock or PTP hardware clock (PHC)
+After=ptp4l.service
 
 [Service]
 Type=simple

puppet-manifests/src/modules/platform/templates/ptp4l.conf.erb

@@ -82,10 +82,10 @@ delay_filter            moving_median
 delay_filter_length     10
 egressLatency           0
 ingressLatency          0
-<%- if @slave_only == true -%>
-boundary_clock_jbod     0
-<%- else -%>
+<%- if @slave_only == false and scope['platform::ptp::mode'].downcase == 'hardware' -%>
 boundary_clock_jbod     1
+<%- else -%>
+boundary_clock_jbod     0
 <%- end -%>
 #
 # Clock description

puppet-manifests/src/modules/platform/templates/ptp4l.pmon.conf.erb

@@ -1,19 +0,0 @@
-[process]
-process  = ptp4l
-service  = ptp4l
-pidfile  = /var/run/ptp4l.pid
-style    = lsb            ; ocf or lsb
-severity = minor          ; minor, major, critical
-restarts = 0              ; restart retries before error assertion
-interval = 10             ; number of seconds to wait between restarts
-debounce = 10             ; number of seconds that a process needs to remain
-                          ;   running before degrade is removed and retry count
-                          ;   is cleared.
-; These settings will generate a log only without attempting to restart
-; pmond will put the process into an ignore state after failure.
-
-startuptime  = 180        ; Seconds to wait after process start before starting the debounce monitor
-mode  = passive           ; Monitoring mode: passive (default) or active
-                          ; passive: process death monitoring (default: always)
-                          ; active : heartbeat monitoring, i.e. request / response messaging
-                          ; ignore : do not monitor or stop monitoring

puppet-manifests/src/modules/platform/templates/ptp4l.service.erb

@@ -1,5 +1,7 @@
 [Unit]
 Description=Precision Time Protocol (PTP) service
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=simple