From 4afb5074c53ff103ac9a47039907970e05cc4d88 Mon Sep 17 00:00:00 2001 From: Alex Kozyrev Date: Tue, 11 Sep 2018 14:16:10 -0400 Subject: [PATCH] PTP: specify ethernet interfaces in the ptp4l.conf file. The ptp4l process will fail in case there are no NICs specified. We need to list all the NICs in the configuration file since NIC specification has been removed from command line earlier. Change-Id: Ib68406a2ed514830674627180c451d274b581f74 Story: 2002935 Task: 22923 Signed-off-by: Alex Kozyrev --- puppet-manifests/centos/build_srpm.data | 2 +- .../src/modules/platform/templates/ptp4l.conf.erb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/puppet-manifests/centos/build_srpm.data b/puppet-manifests/centos/build_srpm.data index 44049d7bb8..f2aeaf8415 100644 --- a/puppet-manifests/centos/build_srpm.data +++ b/puppet-manifests/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="src" -TIS_PATCH_VER=63 +TIS_PATCH_VER=64 diff --git a/puppet-manifests/src/modules/platform/templates/ptp4l.conf.erb b/puppet-manifests/src/modules/platform/templates/ptp4l.conf.erb index 61c56df480..486d8f1333 100644 --- a/puppet-manifests/src/modules/platform/templates/ptp4l.conf.erb +++ b/puppet-manifests/src/modules/platform/templates/ptp4l.conf.erb @@ -96,12 +96,14 @@ manufacturerIdentity 00:00:00 userDescription ; timeSource 0xA0 -<%- if scope['platform::ptp::transport'] == 'udp' -%> [<%= @slave_interface %>] +<%- if scope['platform::ptp::transport'] == 'udp' -%> network_transport UDPv<%= @slave_subnet %> +<%- end -%> <%- if @slave_only == false -%> [<%= @master_interface %>] +<%- if scope['platform::ptp::transport'] == 'udp' -%> network_transport UDPv<%= @master_subnet %> <%- end -%> <%- end -%>