diff --git a/elements/openstack-clients/environment.d/10-openstack-clients-venv-dir.bash b/elements/openstack-clients/environment.d/10-openstack-clients-venv-dir.bash
index d5219b25e..8022453d8 100755
--- a/elements/openstack-clients/environment.d/10-openstack-clients-venv-dir.bash
+++ b/elements/openstack-clients/environment.d/10-openstack-clients-venv-dir.bash
@@ -72,3 +72,11 @@ fi
 if [ -z "${SWIFTCLIENT_EXTRA_INSTALL_OPTS:-}" ]; then
     export SWIFTCLIENT_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""}
 fi
+
+# openstackclient
+if [ -z "${OPENSTACKCLIENT_VENV_DIR:-}" ]; then
+    export OPENSTACKCLIENT_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/python-openstackclient"}
+fi
+if [ -z "${OPENSTACKCLIENT_EXTRA_INSTALL_OPTS:-}" ]; then
+    export OPENSTACKCLIENT_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""}
+fi
diff --git a/elements/openstack-clients/install.d/python-openstackclient-package-install/51-openstackclient b/elements/openstack-clients/install.d/python-openstackclient-package-install/51-openstackclient
new file mode 100755
index 000000000..dc6a4df47
--- /dev/null
+++ b/elements/openstack-clients/install.d/python-openstackclient-package-install/51-openstackclient
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -eux
+
+install-packages python-openstackclient
diff --git a/elements/openstack-clients/install.d/python-openstackclient-source-install/51-openstackclient b/elements/openstack-clients/install.d/python-openstackclient-source-install/51-openstackclient
new file mode 100755
index 000000000..df088f683
--- /dev/null
+++ b/elements/openstack-clients/install.d/python-openstackclient-source-install/51-openstackclient
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -eux
+
+install-openstack-client $OPENSTACKCLIENT_EXTRA_INSTALL_OPTS -c openstack -i $OPENSTACKCLIENT_VENV_DIR
+
+add-selinux-path-substitution /usr/bin $OPENSTACKCLIENT_VENV_DIR/bin
diff --git a/elements/openstack-clients/source-repository-clients b/elements/openstack-clients/source-repository-clients
index acb9f621d..7d4262df2 100644
--- a/elements/openstack-clients/source-repository-clients
+++ b/elements/openstack-clients/source-repository-clients
@@ -7,3 +7,4 @@ python-keystoneclient git /opt/stack/python-keystoneclient https://git.openstack
 python-neutronclient git /opt/stack/python-neutronclient https://git.openstack.org/openstack/python-neutronclient.git
 python-novaclient git /opt/stack/python-novaclient https://git.openstack.org/openstack/python-novaclient.git
 python-swiftclient git /opt/stack/python-swiftclient https://git.openstack.org/openstack/python-swiftclient.git
+python-openstackclient git /opt/stack/python-openstackclient https://git.openstack.org/openstack/python-openstackclient.git