diff --git a/defaults/main.yml b/defaults/main.yml
index de217e9..2b18056 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -51,10 +51,11 @@ rally_requires_pip_packages:
   - virtualenv
 
 rally_pip_packages:
-  - setuptools
+  - ansible==2.3.2.0
+  - cmd2<0.9.0 # >=0.9.0 is python3 only
   - pymysql
   - rally
-  - ansible==2.3.2.0
+  - setuptools
 
 # The inventory group where Rally will be installed.
 # This variable is used by the repo_build process to determine
diff --git a/releasenotes/notes/cmd2-0.9.0-838765e91d9be69e.yaml b/releasenotes/notes/cmd2-0.9.0-838765e91d9be69e.yaml
new file mode 100644
index 0000000..70dc3d9
--- /dev/null
+++ b/releasenotes/notes/cmd2-0.9.0-838765e91d9be69e.yaml
@@ -0,0 +1,7 @@
+---
+issues:
+  - |
+    All OSA releases earlier than 17.0.5, 16.0.4, and 15.1.22 will fail to build the
+    rally venv due to the release of the new cmd2-0.9.0 python library. Deployers are
+    encouraged to update to the latest OSA release which pins to an appropriate version
+    which is compatible with python2.