Skip to content

Management vrf ntp support #3204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lguohan merged 5 commits into from
Sep 16, 2019
Merged

Management vrf ntp support #3204

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f9ef879
[sonic-buildimage] Support for NTP over management VRF
Jul 22, 2019
e640aed
Updating mgmt vrf NTP to use lo-m instead of moving lo to mvrf
kannankvs Sep 3, 2019
5be8a8e
Removed sed usage for generating /etc/init.d/ntp file. New file creat…
kannankvs Sep 11, 2019
a9fcfb0
changed to avoid unit test failure for interfaces.j2 due to new comme…
kannankvs Sep 12, 2019
b29fb95
Adding unit test code for interfaces.j2 where management vrf related …
kannankvs Sep 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions build_debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,9 @@ sudo cp files/dhcp/graphserviceurl $FILESYSTEM_ROOT/etc/dhcp/dhclient-exit-hooks
sudo cp files/dhcp/snmpcommunity $FILESYSTEM_ROOT/etc/dhcp/dhclient-exit-hooks.d/
sudo cp files/dhcp/vrf $FILESYSTEM_ROOT/etc/dhcp/dhclient-exit-hooks.d/
sudo cp files/dhcp/dhclient.conf $FILESYSTEM_ROOT/etc/dhcp/
if [ -f files/image_config/ntp/mgmtvrf_add_cgexec_to_ntp.sh ]; then
./files/image_config/ntp/mgmtvrf_add_cgexec_to_ntp.sh $FILESYSTEM_ROOT/etc/init.d/ntp
fi

## Version file
sudo mkdir -p $FILESYSTEM_ROOT/etc/sonic
Expand Down
2 changes: 2 additions & 0 deletions files/build_templates/sonic_debian_extension.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ sudo cp $IMAGE_CONFIGS/ntp/ntp-config.service $FILESYSTEM_ROOT/etc/systemd/syste
echo "ntp-config.service" | sudo tee -a $GENERATED_SERVICE_FILE
sudo cp $IMAGE_CONFIGS/ntp/ntp-config.sh $FILESYSTEM_ROOT/usr/bin/
sudo cp $IMAGE_CONFIGS/ntp/ntp.conf.j2 $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/
sudo cp $IMAGE_CONFIGS/ntp/mgmtvrf_ntpq $FILESYSTEM_ROOT/usr/bin/
sudo cp $IMAGE_CONFIGS/ntp/mgmtvrf_ntpstat $FILESYSTEM_ROOT/usr/bin/

# Copy warmboot-finalizer files
sudo LANG=C cp $IMAGE_CONFIGS/warmboot-finalizer/finalize-warmboot.sh $FILESYSTEM_ROOT/usr/local/bin/finalize-warmboot.sh
Expand Down
3 changes: 3 additions & 0 deletions files/image_config/ntp/mgmtvrf_add_cgexec_to_ntp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash
sudo sed -i '/start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -p $PIDFILE $NTPD_OPTS/d' $1
sudo sed -i '/flock -w 180 9/a \\t\t\tvrfEnabled=$(/usr/local/bin/sonic-cfggen -d -v '"'MGMT_VRF_CONFIG[\"vrf_global\"][\"mgmtVrfEnabled\"]'"')\n\t\t\tif [ "$vrfEnabled" = "true" ]\n\t\t\tthen\n\t\t\t\tlog_daemon_msg "Starting NTP server in mgmt-vrf" "ntpd"\n\t\t\t\tcgexec -g l3mdev:mgmt start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -p $PIDFILE $NTPD_OPTS\n\t\t\telse\n\t\t\t\tlog_daemon_msg "Starting NTP server in default-vrf" "ntpd"\n\t\t\t\tstart-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -p $PIDFILE $NTPD_OPTS\n\t\t\tfi' $1
5 changes: 5 additions & 0 deletions files/image_config/ntp/mgmtvrf_ntpq
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ip link set dev lo master mgmt
sleep 1
ntpq $@
sleep 1
ip link set dev lo nomaster
5 changes: 5 additions & 0 deletions files/image_config/ntp/mgmtvrf_ntpstat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ip link set dev lo master mgmt
sleep 1
ntpstat $@
sleep 1
ip link set dev lo nomaster