Configure glance ceph during upgrade and genconfig

Previously the glance ceph backend was only being configured during
the deploy and reconfigure commands. This change ensures that it is
configured during the upgrade and genconfig commands as well.

Some of the related host/group selection logic has been cleaned up,
as it was a little tautolgous.

Change-Id: Ibfc2bfaaf2e24fb3a0697925e7723794046787fa
Closes-Bug: #1728060

ansible/roles/glance/tasks/config.yml

@@ -1,4 +1,14 @@
 ---
+- 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

@@ -1,23 +1,8 @@
 ---
-- 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*"