From 31ad22abc46bae49728013c3635fc6d1329aead0 Mon Sep 17 00:00:00 2001
From: Will Szumski <will@stackhpc.com>
Date: Mon, 30 Mar 2020 10:39:26 +0100
Subject: [PATCH] Switch to stackhpc fork of resmo.ntp
There is no activity on the resmo fork of the role and it seems
impossible to get any patches merged.
Change-Id: I1f09f7c11767226e89b34687dab1553e87be76ba
Story: 2005272
Task: 39197
---
ansible/ntp.yml | 7 +------
doc/source/configuration/hosts.rst | 2 +-
.../notes/blacklist-chrony-019d39fad263905c.yaml | 9 +++++++++
requirements.yml | 4 ++--
4 files changed, 13 insertions(+), 9 deletions(-)
create mode 100644 releasenotes/notes/blacklist-chrony-019d39fad263905c.yaml
diff --git a/ansible/ntp.yml b/ansible/ntp.yml
index df2a455f..d11f2f6f 100644
--- a/ansible/ntp.yml
+++ b/ansible/ntp.yml
@@ -6,10 +6,5 @@
roles:
- role: yatesr.timezone
become: True
- - role: resmo.ntp
+ - role: stackhpc.ntp
become: True
- # NOTE(mgoddard): The resmo.ntp role fails if ntp_service_enabled is set
- # to false, since it tries to disable the ntpd service which does not
- # exist. Skip the role if it is disabled.
- # https://storyboard.openstack.org/#!/story/2007384.
- when: ntp_service_enabled | bool
diff --git a/doc/source/configuration/hosts.rst b/doc/source/configuration/hosts.rst
index 08ea2158..c7781c83 100644
--- a/doc/source/configuration/hosts.rst
+++ b/doc/source/configuration/hosts.rst
@@ -484,7 +484,7 @@ configured via ``ntp_config_server``, and by default the ``pool.ntp.org``
servers are used. A list of restrictions may be added via
``ntp_config_restrict``, and a list of interfaces to listen on via
``ntp_config_listen``. Other options and their default values may be found in
-the `resmo.ntp <https://galaxy.ansible.com/resmo/ntp>`__ Ansible role.
+the `stackhpc.ntp <https://galaxy.ansible.com/stackhpc/ntp>`__ Ansible role.
.. code-block:: yaml
:caption: ``ntp.yml``
diff --git a/releasenotes/notes/blacklist-chrony-019d39fad263905c.yaml b/releasenotes/notes/blacklist-chrony-019d39fad263905c.yaml
new file mode 100644
index 00000000..074b8d52
--- /dev/null
+++ b/releasenotes/notes/blacklist-chrony-019d39fad263905c.yaml
@@ -0,0 +1,9 @@
+---
+fixes:
+ - |
+ Fixes an issue where chronyd would be enabled as a systemd service in
+ addition to ntpd. This causes issues in deployments where the NTP servers
+ have been customized, as chronyd would win the race on startup, but its
+ configuration file would not have been configured by Kayobe. `See story
+ 2005272 <https://storyboard.openstack.org/#!/story/2005272>`_ for more
+ details.
diff --git a/requirements.yml b/requirements.yml
index 2f2a8d1e..17baff30 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -11,8 +11,8 @@
- src: mrlesmithjr.mdadm
# There are no versioned releases of this role.
version: 5be3ee7d330aa17317897bd104dc87ff0df11915
-- src: resmo.ntp
- version: 0.4.0
+- src: stackhpc.ntp
+ version: 2.0.0
- src: singleplatform-eng.users
version: v1.2.5
- src: stackhpc.dell-powerconnect-switch
--
GitLab