diff --git a/doc/source/man/nova-manage.rst b/doc/source/man/nova-manage.rst
index 2bc6c41a74..4a76ce34c6 100644
--- a/doc/source/man/nova-manage.rst
+++ b/doc/source/man/nova-manage.rst
@@ -194,6 +194,10 @@ Nova Logs
 Nova Shell
 ~~~~~~~~~~
 
+.. deprecated:: 16.0.0
+
+    This will be removed in 17.0.0 (Queens)
+
 ``nova-manage shell bpython``
 
     Starts a new bpython shell.
diff --git a/nova/cmd/manage.py b/nova/cmd/manage.py
index 4c0d186a8e..29b7da5c0b 100644
--- a/nova/cmd/manage.py
+++ b/nova/cmd/manage.py
@@ -118,6 +118,12 @@ def param2id(object_id):
 
 
 class ShellCommands(object):
+
+    # TODO(stephenfin): Remove this during the Queens cycle
+    description = ('DEPRECATED: The shell commands are deprecated since '
+                   'Pike as they serve no useful purpose in modern nova. '
+                   'They will be removed in an upcoming release.')
+
     def bpython(self):
         """Runs a bpython shell.
 
diff --git a/releasenotes/notes/deprecate-nova-manage-commands-9de1abbc94e06d16.yaml b/releasenotes/notes/deprecate-nova-manage-commands-9de1abbc94e06d16.yaml
new file mode 100644
index 0000000000..59cfc6f5d1
--- /dev/null
+++ b/releasenotes/notes/deprecate-nova-manage-commands-9de1abbc94e06d16.yaml
@@ -0,0 +1,14 @@
+---
+deprecations:
+  - |
+    A number of `nova-manage` commands have been deprecated. The commands,
+    along with the reasons for their deprecation, are listed below:
+
+    `shell`
+
+      This starts the Python interactive interpreter. It is a clone of the same
+      functionality found in Django's `django-manage` command. This command
+      hasn't been actively maintained in a long time and is not tested. It will
+      simply be removed.
+
+    These commands will be removed in their entirety during the Queens cycle.