From b05ba768e3ede2f89d8f2d9af90c3614045ff7a7 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 20 May 2020 12:08:44 +0100
Subject: [PATCH] Move timezone configuration from ntp.yml to time.yml

Change-Id: I0814f62d25ebc9c6d007d2514d57f023308f54c4
Story: 2006574
Task: 39812
---
 ansible/group_vars/all/{ntp => time}                |  2 +-
 doc/source/configuration/hosts.rst                  | 11 ++++++-----
 etc/kayobe/ntp.yml                                  | 13 ++++---------
 etc/kayobe/time.yml                                 | 12 ++++++++++++
 .../notes/timezone-config-298cff76834f5fb4.yaml     |  6 ++++++
 5 files changed, 29 insertions(+), 15 deletions(-)
 rename ansible/group_vars/all/{ntp => time} (85%)
 create mode 100644 etc/kayobe/time.yml
 create mode 100644 releasenotes/notes/timezone-config-298cff76834f5fb4.yaml

diff --git a/ansible/group_vars/all/ntp b/ansible/group_vars/all/time
similarity index 85%
rename from ansible/group_vars/all/ntp
rename to ansible/group_vars/all/time
index a7ba047fb..a2b277c1e 100644
--- a/ansible/group_vars/all/ntp
+++ b/ansible/group_vars/all/time
@@ -1,5 +1,5 @@
 ---
-# Kayobe NTP configuration.
+# Kayobe time configuration.
 
 ###############################################################################
 # Timezone.
diff --git a/doc/source/configuration/hosts.rst b/doc/source/configuration/hosts.rst
index 6dd7e713e..d6754f346 100644
--- a/doc/source/configuration/hosts.rst
+++ b/doc/source/configuration/hosts.rst
@@ -381,14 +381,14 @@ overwritten by Kayobe are removed.
 Timezone
 ========
 *tags:*
-  | ``ntp``
+  | ``timezone``
 
 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:
 
 .. code-block:: yaml
-   :caption: ``ntp.yml``
+   :caption: ``timezone.yml``
 
    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
 8.
 
-Kolla Ansible can deploy a chrony container, and from the Ussuri release chrony
-is enabled by default.
+Kolla Ansible can deploy a chrony container on overcloud hosts, and from the
+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
 ``${KAYOBE_CONFIG_PATH}/kolla.yml``:
diff --git a/etc/kayobe/ntp.yml b/etc/kayobe/ntp.yml
index a6c4372de..4903b4391 100644
--- a/etc/kayobe/ntp.yml
+++ b/etc/kayobe/ntp.yml
@@ -1,18 +1,13 @@
 ---
 # Kayobe NTP configuration.
 
-###############################################################################
-# Timezone.
-
-# Name of the local timezone.
-#timezone:
-
-###############################################################################
-# Network Time Protocol (NTP).
-
+# Timezone configuration has moved to time.yml.
+#
 # Support for running an NTP daemon on the host is no longer available.
 # Instead the Kolla Ansible 'chrony' container is deployed by default. Set
 # '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.
diff --git a/etc/kayobe/time.yml b/etc/kayobe/time.yml
new file mode 100644
index 000000000..c0a86d7c7
--- /dev/null
+++ b/etc/kayobe/time.yml
@@ -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
diff --git a/releasenotes/notes/timezone-config-298cff76834f5fb4.yaml b/releasenotes/notes/timezone-config-298cff76834f5fb4.yaml
new file mode 100644
index 000000000..043e31afa
--- /dev/null
+++ b/releasenotes/notes/timezone-config-298cff76834f5fb4.yaml
@@ -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``.