diff --git a/templates/cinder.conf.j2 b/templates/cinder.conf.j2
index 0bdab63f..e0d3ba7b 100644
--- a/templates/cinder.conf.j2
+++ b/templates/cinder.conf.j2
@@ -61,7 +61,13 @@ nova_catalog_info = {{ cinder_nova_catalog_info }}
 nova_catalog_admin_info = {{ cinder_nova_catalog_admin_info }}
 
 ## Glance
+# TODO(odyssey4me): Remove this conditional once https://review.openstack.org/299928 has merged
+{% if cinder_glance_api_servers is defined %}
 glance_api_servers = {{ cinder_glance_api_servers }}
+{% else %}
+glance_host = {{ cinder_glance_host }}
+glance_port = 9292
+{% endif %}
 glance_num_retries = 0
 glance_api_version = {{ cinder_glance_api_version }}