diff --git a/ansible/ntp.yml b/ansible/ntp.yml
index 9160d990c..df2a455f1 100644
--- a/ansible/ntp.yml
+++ b/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
diff --git a/releasenotes/notes/skip-ntp-if-disabled-585c756f01b34bfa.yaml b/releasenotes/notes/skip-ntp-if-disabled-585c756f01b34bfa.yaml
new file mode 100644
index 000000000..dd474122b
--- /dev/null
+++ b/releasenotes/notes/skip-ntp-if-disabled-585c756f01b34bfa.yaml
@@ -0,0 +1,7 @@
+---
+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.