diff --git a/defaults/main.yml b/defaults/main.yml
index 399a44b7..6bf225d0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -257,7 +257,6 @@ cinder_service_in_ldap: false
 
 # Cinder packages that must be installed before anything else
 cinder_requires_pip_packages:
-  - python-keystoneclient # Keystoneclient needed by the keystone Ansible module
   - shade
   - virtualenv
 
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index 55bc2826..4cb1ee12 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -24,6 +24,7 @@ cinder_distro_packages:
   - postgresql-devel
   - kmod-devel
   - kmod-libs
+  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
   - zlib-devel
   - which
   - iscsi-initiator-utils
diff --git a/vars/suse-42.yml b/vars/suse-42.yml
index 922d3af9..e8572023 100644
--- a/vars/suse-42.yml
+++ b/vars/suse-42.yml
@@ -23,6 +23,7 @@ cinder_distro_packages:
   - rpcbind
   - libxslt-devel
   - postgresql-devel
+  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
   - libkmod-devel
   - libkmod2
   - zlib-devel
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index bcf4c763..55c5bb8b 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -30,6 +30,7 @@ cinder_distro_packages:
   - libxslt1-dev
   - nfs-common
   - open-iscsi
+  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
   - rpcbind
   - rsync
   - zlib1g