Merge glance sections for nova.conf.j2

Change-Id: I1727a6706520130793d31f8b514d955993d2c2a5
(cherry picked from commit 6b61cbe)

Author: likui

ansible/roles/nova-cell/templates/nova.conf.j2

@@ -98,6 +98,7 @@ endpoint_override = {{ ironic_internal_endpoint }}/v1
 lock_path = /var/lib/nova/tmp
 
 [glance]
+debug = {{ nova_logging_debug }}
 api_servers = {{ glance_internal_endpoint }}
 cafile = {{ openstack_cacert }}
 num_retries = 3
@@ -197,10 +198,6 @@ policy_file = {{ nova_policy_file }}
 [privsep_entrypoint]
 helper_command=sudo nova-rootwrap /etc/nova/rootwrap.conf privsep-helper --config-file /etc/nova/nova.conf
 
-[glance]
-debug = {{ nova_logging_debug }}
-cafile = {{ openstack_cacert }}
-
 [guestfs]
 debug = {{ nova_logging_debug }}