Merge "Skip resmo.ntp role if ntp_service_enabled is false"

ansible/ntp.yml

@@ -8,3 +8,8 @@
       become: True
     - role: resmo.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

releasenotes/notes/skip-ntp-if-disabled-585c756f01b34bfa.yaml

+---
+fixes:
+  - |
+    Fixes an issue where host configuration would fail if
+    ``ntp_service_enabled`` is set to ``false`` or ``kolla_enable_chrony`` is
+    set to ``true``. See `story 2007384
+    <https://storyboard.openstack.org/#!/story/2007384>`__ for details.