Skip to content

Commit a313897

Browse files
committed
fix(contrib/coreos): remove custom clock sync logic
This actually causes issues, as calling /usr/bin/timedatectl set-ntp true actually starts systemd-timesyncd.service which stops ntpd. We also suspect this logic is no longer necessary as coreos/coreos-overlay#1142 has made its way to the stable channel.
1 parent f824206 commit a313897

1 file changed

Lines changed: 0 additions & 20 deletions

File tree

contrib/coreos/user-data.example

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,6 @@ coreos:
5353
[Service]
5454
Type=oneshot
5555
ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 1.6.0'
56-
- name: ntpdate.service
57-
command: start
58-
- name: timedate-ntp-synchronization.service
59-
command: start
60-
content: |
61-
[Unit]
62-
Description=Synchronize system clock
63-
After=ntpdate.service
64-
65-
[Service]
66-
ExecStart=/usr/bin/timedatectl set-timezone UTC
67-
ExecStart=/usr/bin/timedatectl set-ntp true
68-
ExecStart=/sbin/hwclock --systohc --utc
69-
RemainAfterExit=yes
70-
Type=oneshot
7156
- name: debug-etcd.service
7257
content: |
7358
[Unit]
@@ -191,8 +176,3 @@ write_files:
191176
content: |
192177
[Coredump]
193178
Storage=none
194-
- path: /etc/systemd/system/ntpd.service.d/debug.conf
195-
content: |
196-
[Service]
197-
ExecStart=
198-
ExecStart=/usr/sbin/ntpd -g -n -f /var/lib/ntp/ntp.drift

0 commit comments

Comments
 (0)