Merge "Default to use host/port for glance_api_servers"

etc/openstack_deploy/user_group_vars.yml

@@ -119,7 +119,8 @@ glance_service_project_domain_id: default
 glance_service_user_domain_id: default
 glance_service_adminurl: "{{ glance_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ glance_service_port }}"
 glance_service_region: "{{ service_region }}"
-glance_api_servers: "{% for host in groups['glance_all'] %}{{ hostvars[host]['container_address'] }}:{{ glance_service_port }}{% if not loop.last %},{% endif %}{% endfor %}"
+# Only specify this if you want to list the servers - by default LB host/port will be used
+#glance_api_servers: "{% for host in groups['glance_all'] %}{{ hostvars[host]['container_address'] }}:{{ glance_service_port }}{% if not loop.last %},{% endif %}{% endfor %}"
 
 
 ## Keystone

playbooks/os-nova-install.yml

@@ -103,3 +103,4 @@
     ansible_hostname: "{{ container_name }}"
     ansible_ssh_host: "{{ container_address }}"
     is_metal: "{{ properties.is_metal|default(false) }}"
+    glance_host: "{{ internal_lb_vip_address }}"

playbooks/roles/os_cinder/templates/cinder.conf.j2

@@ -50,10 +50,13 @@ nova_catalog_info = {{ cinder_nova_catalog_info }}
 nova_catalog_admin_info = {{ cinder_nova_catalog_admin_info }}
 
 ## Glance
+{% if glance_api_servers is defined %}
+glance_api_servers = {{ glance_api_servers }}
+{% else %}
 glance_host = {{ glance_host }}
 glance_port = {{ glance_service_port }}
+{% endif %}
 glance_num_retries = 0
-glance_api_servers = {{ glance_api_servers }}
 
 volume_clear = {{ cinder_volume_clear }}
 volume_clear_size = {{ cinder_volume_clear_size }}

playbooks/roles/os_nova/templates/nova.conf.j2

@@ -120,8 +120,12 @@ server_proxyclient_address = {{ ansible_ssh_host }}
 
 # Glance
 [glance]
+{% if glance_api_servers is defined %}
 api_servers = {{ glance_api_servers }}
-
+{% else %}
+host = {{ glance_host }}
+port = {{ glance_service_port }}
+{% endif %}
 
 # Neutron
 [neutron]