- Centralize NTP servers in Pillar
- Update templates for Chrony and NTpd
- Manage ntpdate and ntp.conf on FreeBSD
Ref T1223
Details
Details
- Reviewers
dereckson - Maniphest Tasks
- T1223: Configure NTP in rOPS
- Commits
- rOPSe0944c8ff4a3: Standardize NTP configuration
Diff Detail
Diff Detail
- Repository
- rOPS Nasqueron Operations
- Lint
Lint Not Applicable - Unit
Tests Not Applicable
Event Timeline
Comment Actions
Pillar OK.
Configuration templates OK, with proper headers.
Open questions for the role logic:
- ntpd vs ntpdate -> which one to run on FreeBSD? We'll need to drop the other one
- servers are defined twice, one in RC config, one in NTP configuration, which one we keep?
From T2192 and https://agora.nasqueron.org/Operations_grimoire/NTP#FreeBSD:
- ntpd is favoured
| roles/core/ntp/init.sls | ||
|---|---|---|
| 44 | We don't need that one, but we'd need a /etc/rc.conf.d/ntpd file with as content: ntpd_enable="YES" | |
| roles/core/ntp/init.sls | ||
|---|---|---|
| 18 | Actually we're normalizing with " right now. | |
Comment Actions
Looks good to me, just a small style fix and we can deploy it.
| roles/core/ntp/init.sls | ||
|---|---|---|
| 12 | We can remove all the double quotes lines 12 to 22, excepted for Jinja /etc/chrony.conf:
file.managed:
- source: salt://roles/core/ntp/files/chrony.conf.jinja
- template: jinja
- context:
servers: {{ salt["pillar.get"]("ntp_servers") }}
- user: root
- group: root
- mode: 644
- watch_in:
- service: chrony_service | |
| 26 | Double quotes aren't useful here, YAML read most expressions as strings. One of the only case you need double quotes is this when the value contains :, like keys: "alpha: emc123" | |
| 33 | ||
Comment Actions
Looks good to me.
To be deployed to all server this week-end before merging.
Tests servers:
- Linux / chrony : Dwellers
- FreeBSD / ntp : WindRiver