diff --git a/docs/ntp.md b/docs/ntp.md index efa40b9341834ba70eff7f0fb3bff4f07c568be7..4a8dc04199a805769feaa0de1674cf015d3f014b 100644 --- a/docs/ntp.md +++ b/docs/ntp.md @@ -26,6 +26,15 @@ ntp_servers: - "3.your-ntp-server.org iburst" ``` +## Setting the TimeZone + +The timezone can also be set by the `ntp_timezone` , eg: "Etc/UTC","Asia/Shanghai". If not set, the timezone will not change. + +```ShellSession +ntp_enabled: true +ntp_timezone: Etc/UTC +``` + ## Advanced Configure Enable `tinker panic` is useful when running NTP in a VM environment to avoiding clock drift on VMs. It only takes effect when ntp_manage_config is true. diff --git a/roles/kubernetes/preinstall/defaults/main.yml b/roles/kubernetes/preinstall/defaults/main.yml index d1cc42cee0b951c12ac53629ce7a2955c2a26bf1..e06485101236bb6711a8ec26db94ccc841b527c6 100644 --- a/roles/kubernetes/preinstall/defaults/main.yml +++ b/roles/kubernetes/preinstall/defaults/main.yml @@ -100,3 +100,6 @@ ntp_tinker_panic: false # Force sync time immediately after the ntp installed, which is useful in in newly installed system. ntp_force_sync_immediately: false + +# Set the timezone for your server. eg: "Etc/UTC","Etc/GMT-8". If not set, the timezone will not change. +ntp_timezone: "" diff --git a/roles/kubernetes/preinstall/tasks/0081-ntp-configurations.yml b/roles/kubernetes/preinstall/tasks/0081-ntp-configurations.yml index ba4578744be353431dc71a3262df96ff67e899d2..d80d14e5ee11f93cd632d74cb52179449071ca69 100644 --- a/roles/kubernetes/preinstall/tasks/0081-ntp-configurations.yml +++ b/roles/kubernetes/preinstall/tasks/0081-ntp-configurations.yml @@ -63,3 +63,17 @@ name: "{{ ntp_service_name }}" state: started enabled: true + +- name: Ensure tzdata package + package: + name: + - tzdata + state: present + when: + - ntp_timezone + +- name: Set timezone + timezone: + name: "{{ ntp_timezone }}" + when: + - ntp_timezone diff --git a/tests/files/packet_almalinux8-calico.yml b/tests/files/packet_almalinux8-calico.yml index f9ab1299ded0a21e37e94db3116375668a2c622b..1df4a64e5d673576ed4e7192f4f7c33c0f111204 100644 --- a/tests/files/packet_almalinux8-calico.yml +++ b/tests/files/packet_almalinux8-calico.yml @@ -12,6 +12,7 @@ loadbalancer_apiserver_type: haproxy # NTP mangement ntp_enabled: true +ntp_timezone: Etc/UTC ntp_manage_config: true ntp_tinker_panic: true ntp_force_sync_immediately: true