openstack/kayobe
Code Issues Proposed changes

Move timezone configuration from ntp.yml to time.yml

Browse Source 
Change-Id: I0814f62d25ebc9c6d007d2514d57f023308f54c4
Story: 2006574
Task: 39812
This commit is contained in:
Mark Goddard 2020-05-20 12:08:44 +01:00
parent b9d76f6ef5
commit b05ba768e3
5 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/group_vars/all/ntp → ansible/group_vars/all/time
View File

@ -1,5 +1,5 @@
--- ---
# Kayobe NTP configuration. # Kayobe time configuration.
############################################################################### ###############################################################################
# Timezone. # Timezone.

11
doc/source/configuration/hosts.rst
View File

@ -381,14 +381,14 @@ overwritten by Kayobe are removed.
Timezone Timezone
======== ========
*tags:* *tags:*
| ``ntp`` | ``timezone``
The timezone can be configured via the ``timezone`` variable in The timezone can be configured via the ``timezone`` variable in
``${KAYOBE_CONFIG_PATH}/ntp.yml``. The value must be a valid Linux ``${KAYOBE_CONFIG_PATH}/time.yml``. The value must be a valid Linux
timezone. For example: timezone. For example:
.. code-block:: yaml .. code-block:: yaml
:caption: ``ntp.yml`` :caption: ``timezone.yml``
timezone: Europe/London timezone: Europe/London
@ -399,8 +399,9 @@ Since the Ussuri release, Kayobe no longer supports configuration of an NTP
daemon on the host, since the ``ntp`` package is no longer available in CentOS daemon on the host, since the ``ntp`` package is no longer available in CentOS
8. 8.
Kolla Ansible can deploy a chrony container, and from the Ussuri release chrony Kolla Ansible can deploy a chrony container on overcloud hosts, and from the
is enabled by default. Ussuri release chrony is enabled by default. There is no support for running a
chrony container on the seed or seed hypervisor hosts.
To disable the containerised chrony daemon, set the following in To disable the containerised chrony daemon, set the following in
``${KAYOBE_CONFIG_PATH}/kolla.yml``: ``${KAYOBE_CONFIG_PATH}/kolla.yml``:

13
etc/kayobe/ntp.yml
View File

@ -1,18 +1,13 @@
--- ---
# Kayobe NTP configuration. # Kayobe NTP configuration.
############################################################################### # Timezone configuration has moved to time.yml.
# Timezone. #
# Name of the local timezone.
#timezone:
###############################################################################
# Network Time Protocol (NTP).
# Support for running an NTP daemon on the host is no longer available. # Support for running an NTP daemon on the host is no longer available.
# Instead the Kolla Ansible 'chrony' container is deployed by default. Set # Instead the Kolla Ansible 'chrony' container is deployed by default. Set
# 'kolla_enable_chrony' to 'false' in kolla.yml to disable it. # 'kolla_enable_chrony' to 'false' in kolla.yml to disable it.
#
# This file will be removed in the Victoria release.
############################################################################### ###############################################################################
# Dummy variable to allow Ansible to accept this file. # Dummy variable to allow Ansible to accept this file.

12
etc/kayobe/time.yml Normal file
View File

@ -0,0 +1,12 @@
---
# Kayobe time configuration.
###############################################################################
# Timezone.
# Name of the local timezone.
#timezone:
###############################################################################
# Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes

6
releasenotes/notes/timezone-config-298cff76834f5fb4.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
Timezone configuration has been moved from the ``ntp.yml`` configuration
file to ``time.yml``. The Ansible tag applied to the play has been
renamed from ``ntp`` to ``timezone``.