aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-09 09:59:35 +0000
committerGerrit Code Review <review@openstack.org>2016-08-09 09:59:35 +0000
commit88f0fb20dc13ad88dcffd489e97a3850a879737d (patch)
tree6d60ccbfc8a1d570c27a60d5765eb4c88106363e
parent0c87d4256ac3402b9739128e69f45ce10519d46d (diff)
parentaebb1997a1fe0267906905e931c83bf20dd01b23 (diff)
downloadkolla-88f0fb20dc13ad88dcffd489e97a3850a879737d.tar.gz
kolla-88f0fb20dc13ad88dcffd489e97a3850a879737d.zip
Merge "Make Cinder access glance in round robin fashion"
-rw-r--r--ansible/roles/cinder/templates/cinder.conf.j24
1 files changed, 3 insertions, 1 deletions
diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2
index d54bae68b..9aeb50f20 100644
--- a/ansible/roles/cinder/templates/cinder.conf.j2
+++ b/ansible/roles/cinder/templates/cinder.conf.j2
@@ -12,7 +12,9 @@ enable_v1_api=false
osapi_volume_workers = {{ openstack_service_workers }}
volume_name_template = volume-%s
-glance_api_servers = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ glance_api_port }}
+glance_api_servers = {% for host in groups['glance-api'] %}{{ internal_protocol }}://{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ glance_api_port }}{% if not loop.last %},{% endif %}{% endfor %}
+
+glance_num_retries = {{ groups['glance-api'] | length }}
glance_api_version = 2
os_region_name = {{ openstack_region_name }}