From 0cefd644502c7a8851403cbb2e60dd79c906d475 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Sun, 11 Oct 2015 07:22:37 +0000
Subject: [PATCH] Glance round robin for default file backend

Closes-Bug: #1504902
Change-Id: Id4cced68ef078adb3db19c67f62d96275ab2329f
---
 ansible/roles/nova/templates/nova.conf.j2 | 6 ++++++
 ansible/site.yml                          | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
index a07751261e..98300fc03a 100644
--- a/ansible/roles/nova/templates/nova.conf.j2
+++ b/ansible/roles/nova/templates/nova.conf.j2
@@ -76,8 +76,14 @@ rabbit_ha_queues = true
 lock_path = /var/lib/nova/tmp
 
 [glance]
+{% if enable_ceph | bool %}
 host = {{ kolla_internal_address }}
 port = {{ glance_api_port }}
+{% else %}
+api_servers = {% for host in groups['glance-api'] %}{{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:{{ glance_api_port }}{% if not loop.last %},{% endif %}{% endfor %}
+
+num_retries = {{ groups['glance-api'] | length }}
+{% endif %}
 
 [cinder]
 catalog_info = volume:cinder:internalURL
diff --git a/ansible/site.yml b/ansible/site.yml
index b31c6a546a..00e8f64f99 100755
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -28,7 +28,7 @@
   roles:
     - { role: glance, tags: glance, when: enable_glance | bool }
 
-- hosts: [nova-api, nova-conductor, nova-consoleauth, nova-novncproxy, nova-scheduler, compute, ceph-mon]
+- hosts: [nova-api, nova-conductor, nova-consoleauth, nova-novncproxy, nova-scheduler, compute, ceph-mon, glance-api]
   roles:
     - { role: nova, tags: nova, when: enable_nova | bool }