diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml
index b538d98f8c..be297fc989 100644
--- a/ansible-role-requirements.yml
+++ b/ansible-role-requirements.yml
@@ -117,7 +117,7 @@
 - name: os_rally
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_rally
-  version: 0289542a29f4705a6e16c69d19a2d1718d85cf22
+  version: 37f48c1e029b82dabd86e72ce4497e41d186a679
 - name: os_sahara
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_sahara
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 0000000000..70dc3d9d1d
--- /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.
diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh
index c0cf397925..c6b25065c2 100755
--- a/scripts/gate-check-commit.sh
+++ b/scripts/gate-check-commit.sh
@@ -111,10 +111,14 @@ source "${OSA_CLONE_DIR}/scripts/bootstrap-ansible.sh"
 ARA_SRC_HOME="${HOME}/src/git.openstack.org/openstack/ara"
 if [[ -d "${ARA_SRC_HOME}" ]]; then
   # This installs from a git checkout
-  /opt/ansible-runtime/bin/pip install ${ARA_SRC_HOME} "${ANSIBLE_PACKAGE:-ansible}"
+  # PIP_COMMAND and PIP_OPTS are exported by the bootstrap-ansible script.
+  # PIP_OPTS contains the whole set of constraints that need to be applied.
+  ${PIP_COMMAND} install ${PIP_OPTS} ${ARA_SRC_HOME} "${ANSIBLE_PACKAGE:-ansible}"
 else
   # This installs from pypi
-  /opt/ansible-runtime/bin/pip install ara==0.14.0 "${ANSIBLE_PACKAGE:-ansible}"
+  # PIP_COMMAND and PIP_OPTS are exported by the bootstrap-ansible script.
+  # PIP_OPTS contains the whole set of constraints that need to be applied.
+  ${PIP_COMMAND} install ${PIP_OPTS} ara==0.14.0 "${ANSIBLE_PACKAGE:-ansible}"
 fi
 # Dynamically retrieve the location of the ARA callback so we are able to find
 # it on both py2 and py3