Update glance confs and ports

Cleanup all options in the minimal glance confs. Remove options where
the default value was specified explicitly. Updated ports and bindings
to be configurable.

For rabbitmq, those options will only be needed once ceilometer is
implemented. At that point they will exist in an 'if' block.

Change-Id: Idcf0ebc625a5ef3a83181bce10281596a5f1d684
Partially-Implements: blueprint update-configs

ansible/roles/glance/templates/glance-api.conf.j2

@@ -3,13 +3,9 @@ verbose = true
 debug = true
 
 bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
+bind_port = {{ glance_api_port }}
 
-rabbit_host = {{ kolla_internal_address }}
-rabbit_userid = {{ rabbitmq_user }}
-rabbit_password = {{ rabbitmq_password }}
-rabbit_ha_queues = true
-
-notification_driver = nova.openstack.common.notifier.rpc_notifier
+notification_driver = noop
 
 registry_host = {{ kolla_internal_address }}
 

ansible/roles/glance/templates/glance-registry.conf.j2

@@ -3,6 +3,9 @@ verbose = true
 debug = true
 
 bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
+bind_port = {{ glance_registry_port }}
+
+notification_driver = noop
 
 [database]
 connection = mysql://{{ glance_database_user }}:{{ glance_database_password }}@{{ glance_database_address }}/{{ glance_database_name }}