Include ceph_client role if needed

Moves the ceph_client role execution inside the os_glance role
instead of executing it at the playbook level.

Change-Id: I1d24a82f22663150f0db5bbfcb4d957d600db5c2
(cherry picked from commit 3bbd8d13fe)

tasks/main.yml

@@ -57,5 +57,17 @@
   tags:
     - glance-config
 
+- name: Include ceph_client role
+  include_role:
+    name: ceph_client
+  vars:
+    openstack_service_system_user: "{{ glance_system_user_name }}"
+    openstack_service_venv_bin: "{{ glance_bin }}"
+  when:
+    - "'glance_api' in group_names"
+    - "'rbd' in ([glance_default_store] + glance_additional_stores)"
+  tags:
+    - ceph
+
 - name: Flush handlers
   meta: flush_handlers

tests/ansible-role-requirements.yml

@@ -42,6 +42,10 @@
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
   scm: git
   version: origin/stable/ocata
+- name: ceph_client
+  src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
+  scm: git
+  version: origin/stable/ocata
 - name: os_previous_glance
   src: https://git.openstack.org/openstack/openstack-ansible-os_glance
   scm: git