diff --git a/ansible/baremetal-compute-serial-console-post-config.yml b/ansible/baremetal-compute-serial-console-post-config.yml
index 0e2538cd7..0687114a6 100644
--- a/ansible/baremetal-compute-serial-console-post-config.yml
+++ b/ansible/baremetal-compute-serial-console-post-config.yml
@@ -1,6 +1,11 @@
 ---
-# This is a wrapper around baremetal-compute-serial-console which only runs the playbook when
+# This is a wrapper around baremetal-compute-serial-console which only runs the
+# playbook when Ironic is enabled in the overcloud and
 # ironic_serial_console_autoenable is set to true.
 
 - import_playbook: baremetal-compute-serial-console.yml
-  when: ironic_serial_console_autoenable | bool
\ No newline at end of file
+  vars:
+    cmd: enable
+  when:
+    - kolla_enable_ironic | bool
+    - ironic_serial_console_autoenable | bool
diff --git a/releasenotes/notes/fix-baremetal-serial-autoenable-0ccfec017cf2ddbc.yaml b/releasenotes/notes/fix-baremetal-serial-autoenable-0ccfec017cf2ddbc.yaml
new file mode 100644
index 000000000..0a629e1a2
--- /dev/null
+++ b/releasenotes/notes/fix-baremetal-serial-autoenable-0ccfec017cf2ddbc.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixes an issue with ``kayobe overcloud post configure`` when Ironic is
+    disabled, but ``ironic_serial_console_autoenable`` is set to ``true``.
+    See `story 2006662 <https://storyboard.openstack.org/#!/story/2006662>`__
+    for details.