gistfile1.txt

diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml
index 0a54351..f29a211 100644
--- a/playbooks/os-cinder-install.yml
+++ b/playbooks/os-cinder-install.yml
@@ -195,6 +195,7 @@
         - "os-cinder"
     - role: "ceph_client"
       openstack_service_system_user: "{{ cinder_system_user_name }}"
+      openstack_service_venv_bin: "/openstack/venvs/cinder-{{ openstack_release }}/bin"
       tags:
         - "cinder-ceph-client"
         - "ceph-client"
diff --git a/playbooks/roles/ceph_client/tasks/ceph_all.yml b/playbooks/roles/ceph_client/tasks/ceph_all.yml
index a11bc93..c0da7f9 100644
--- a/playbooks/roles/ceph_client/tasks/ceph_all.yml
+++ b/playbooks/roles/ceph_client/tasks/ceph_all.yml
@@ -39,6 +39,10 @@
 - include:  ceph_install.yml
   tags:     ceph-install

+- include: ceph_install_python_libs.yml
+  when:
+    - openstack_service_venv_bin
+
 - include: ceph_get_mon_host.yml
   tags:
     - ceph-config
diff --git a/playbooks/roles/ceph_client/tasks/ceph_install_python_libs.yml b/playbooks/roles/ceph_client/tasks/ceph_install_python_libs.yml
new file mode 100644
index 0000000..b432dc8
--- /dev/null
+++ b/playbooks/roles/ceph_client/tasks/ceph_install_python_libs.yml
@@ -0,0 +1,48 @@
+---
+# Copyright 2014, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- name: Register rados module path
+  command: python -c 'import rados; print rados.__file__'
+  register: rados_module_path
+  tags:
+    - glance-install
+    - glance-pip-packages
+
+- name: Register rbd module path
+  command: python -c 'import rbd; print rbd.__file__'
+  register: rbd_module_path
+  tags:
+    - glance-install
+    - glance-pip-packages
+
+- name: Link rados module into the venv
+  file:
+    src: "{{ rados_module_path.stdout }}"
+    dest: "{{ openstack_service_venv_bin | dirname }}/lib/python2.7/site-packages/{{ rados_module_path.stdout | basename }}"
+    state: link
+    force: "yes"
+  tags:
+    - glance-install
+    - glance-pip-packages
+
+- name: Link rbd module into the venv
+  file:
+    src: "{{ rbd_module_path.stdout }}"
+    dest: "{{ openstack_service_venv_bin | dirname }}/lib/python2.7/site-packages/{{ rbd_module_path.stdout | basename }}"
+    state: link
+    force: "yes"
+  tags:
+    - glance-install
+    - glance-pip-packages