Include ceph_client role if needed

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

Change-Id: Iea317a20d37ae6f187df3eb7db6290d6b99e6997

defaults/main.yml

@@ -384,6 +384,13 @@ nova_ceph_client: '{{ cinder_ceph_client }}'
 # TODO(odyssey4me) - the uuid should be removed, there should be no defaults for secrets
 nova_ceph_client_uuid: 517a4663-3927-44bc-9ea7-4a90e1cd4c66
 
+# Enabled upstream if RBD is in use on cinder backends, which requires that
+# ceph be deployed on the nova compute hosts to enable volume backed instances.
+# The reference to "cinder_backends_rbd_inuse" will be removed and this var
+# should be directly defaulted to False after
+# I6a76e63881150677352520ce9658f1cf6b7e5456 has merged.
+nova_cinder_rbd_inuse: "{{ cinder_backends_rbd_inuse | default(False) }}"
+
 ## General Nova configuration
 # If ``nova_osapi_compute_workers`` is unset the system will use half the number of available VCPUS to
 # compute the number of api workers to use.

tasks/main.yml

@@ -95,6 +95,19 @@
   tags:
     - nova-compute
 
+- name: Include ceph_client role
+  include_role:
+    name: ceph_client
+  vars:
+    openstack_service_system_user: "{{ nova_system_user_name }}"
+    openstack_service_venv_bin: "{{ nova_bin }}"
+  when:
+    - "'nova_compute' in group_names"
+    - "(nova_libvirt_images_rbd_pool is defined) or
+       (nova_cinder_rbd_inuse | bool)"
+  tags:
+    - ceph
+
 - name: Flush handlers
   meta: flush_handlers
 

tests/ansible-role-requirements.yml

@@ -58,6 +58,10 @@
   src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
   scm: git
   version: master
+- name: ceph_client
+  src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
+  scm: git
+  version: master
 - name: os_previous_nova
   src: https://git.openstack.org/openstack/openstack-ansible-os_nova
   scm: git