Merge "Configure glance ceph during upgrade and genconfig"

ansible/roles/glance/tasks/config.yml

 ---
+- include: ceph.yml
+  when:
+    - enable_ceph | bool
+    - glance_backend_ceph | bool
+
+- include: external_ceph.yml
+  when:
+    - enable_ceph | bool == False
+    - glance_backend_ceph | bool
+
 - name: Ensuring config directories exist
   file:
     path: "{{ node_config_directory }}/{{ item.key }}"

ansible/roles/glance/tasks/deploy.yml

 ---
-- include: ceph.yml
-  when:
-    - (enable_ceph | bool) and (glance_backend_ceph | bool)
-    - inventory_hostname in groups['ceph-mon'] or
-      inventory_hostname in groups['glance-api'] or
-      inventory_hostname in groups['glance-registry']
-
-- include: external_ceph.yml
-  when:
-    - (enable_ceph | bool == False) and (glance_backend_ceph | bool)
-    - inventory_hostname in groups['glance-api'] or
-      inventory_hostname in groups['glance-registry']
-
 - include: register.yml
   when: inventory_hostname in groups['glance-api']
 
 - include: config.yml
-  when: inventory_hostname in groups['glance-api'] or
-        inventory_hostname in groups['glance-registry']
 
 - include: clone.yml
   when:

ansible/roles/glance/tasks/external_ceph.yml

@@ -11,6 +11,7 @@
     src: "{{ item }}"
     dest: "{{ node_config_directory }}/glance-api/"
     mode: "0660"
+  when: inventory_hostname in groups['glance-api']
   with_fileglob:
     - "{{ node_custom_config }}/glance/ceph*"