diff --git a/defaults/main.yml b/defaults/main.yml
index 331c875f..b1fa1faa 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -63,7 +63,7 @@ nova_bin: "{{ _nova_bin }}"
 ## Nova user information
 nova_system_user_name: nova
 nova_system_group_name: nova
-nova_system_shell: "{{ (nova_libvirtd_listen_tls | bool) | ternary('/bin/false', '/bin/bash') }}"
+nova_system_shell: /bin/bash
 nova_system_comment: nova system user
 nova_system_home_folder: "/var/lib/{{ nova_system_user_name }}"
 nova_system_slice_name: nova
diff --git a/releasenotes/notes/disable_nova_shell-214c72d31c4d50ec.yaml b/releasenotes/notes/disable_nova_shell-214c72d31c4d50ec.yaml
deleted file mode 100644
index ff88e8bc..00000000
--- a/releasenotes/notes/disable_nova_shell-214c72d31c4d50ec.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-upgrade:
-  - |
-    From now on ``nova_system_shell`` depends on the value of
-    nova_libvirtd_listen_tls by default. When libvirt listens on tls we
-    assume that tunnelled migration is not used, so nova user does not
-    need shell access and it will be disabled. When nova_libvirtd_listen_tls
-    is disabled, ``nova_system_shell`` will be set to /bin/bash