diff --git a/etc/openstack_deploy/openstack_user_config.yml.example b/etc/openstack_deploy/openstack_user_config.yml.example
index d5aa26c77e..a63e4716f9 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.example
+++ b/etc/openstack_deploy/openstack_user_config.yml.example
@@ -615,7 +615,6 @@
 #           rbd_max_clone_depth: 5
 #           rbd_store_chunk_size: 4
 #           rados_connect_timeout: -1
-#           glance_api_version: 2
 #           volume_backend_name: volumes_hdd
 #           rbd_user: "{{ cinder_ceph_client }}"
 #           rbd_secret_uuid: "{{ cinder_ceph_client_uuid }}"
diff --git a/playbooks/inventory/group_vars/hosts.yml b/playbooks/inventory/group_vars/hosts.yml
index c4835a940a..d21ebcd6ed 100644
--- a/playbooks/inventory/group_vars/hosts.yml
+++ b/playbooks/inventory/group_vars/hosts.yml
@@ -240,6 +240,7 @@ cinder_service_region: "{{ service_region }}"
 cinder_service_in_ldap: "{{ service_ldap_backend_enabled }}"
 cinder_rabbitmq_userid: cinder
 cinder_rabbitmq_vhost: /cinder
+cinder_glance_api_version: "{{ (cinder_backends_rbd_inuse|bool and glance_default_store == 'rbd') | ternary('2','1') }}"
 
 
 ## Swift
diff --git a/playbooks/roles/os_cinder/defaults/main.yml b/playbooks/roles/os_cinder/defaults/main.yml
index 3d9778e563..08b249652f 100644
--- a/playbooks/roles/os_cinder/defaults/main.yml
+++ b/playbooks/roles/os_cinder/defaults/main.yml
@@ -213,6 +213,7 @@ cinder_quota_backup_gigabytes: 1000
 
 cinder_glance_host: 127.0.0.1
 cinder_glance_service_port: 9292
+cinder_glance_api_version: 1
 
 cinder_service_in_ldap: false
 
diff --git a/playbooks/roles/os_cinder/templates/cinder.conf.j2 b/playbooks/roles/os_cinder/templates/cinder.conf.j2
index c175067632..735c6bfe54 100644
--- a/playbooks/roles/os_cinder/templates/cinder.conf.j2
+++ b/playbooks/roles/os_cinder/templates/cinder.conf.j2
@@ -68,6 +68,7 @@ glance_host = {{ cinder_glance_host }}
 glance_port = {{ cinder_glance_service_port }}
 {% endif %}
 glance_num_retries = 0
+glance_api_version = {{ cinder_glance_api_version }}
 
 volume_clear = {{ cinder_volume_clear }}
 volume_clear_size = {{ cinder_volume_clear_size }}