diff --git a/spec/nova-common_spec.rb b/spec/nova-common_spec.rb
index 1b340751..9d7b641c 100644
--- a/spec/nova-common_spec.rb
+++ b/spec/nova-common_spec.rb
@@ -770,11 +770,11 @@ describe 'openstack-compute::nova-common' do
           node.set['openstack']['compute']['libvirt']['images_type'] = 'rbd'
         end
 
-        describe 'default rdb settings' do
+        describe 'default rbd settings' do
           it 'sets the libvirt * options correctly' do
             [
               /^images_type=rbd$/,
-              /^images_rbd_pool=images$/,
+              /^images_rbd_pool=instances$/,
               %r{^images_rbd_ceph_conf=/etc/ceph/ceph.conf$},
               /^rbd_user=cinder$/,
               /^rbd_secret_uuid=00000000-0000-0000-0000-000000000000$/
@@ -788,7 +788,7 @@ describe 'openstack-compute::nova-common' do
         describe 'override rbd settings' do
           before do
             node.set['openstack']['compute']['libvirt']['images_type'] = 'rbd'
-            node.set['openstack']['compute']['libvirt']['rbd']['glance']['pool'] = 'myrbd'
+            node.set['openstack']['compute']['libvirt']['rbd']['nova']['pool'] = 'myrbd'
             node.set['openstack']['compute']['libvirt']['rbd']['ceph_conf'] = '/etc/myceph/ceph.conf'
           end
 
diff --git a/templates/default/nova.conf.erb b/templates/default/nova.conf.erb
index 80d88ce5..b3bbc192 100644
--- a/templates/default/nova.conf.erb
+++ b/templates/default/nova.conf.erb
@@ -682,7 +682,7 @@ images_volume_group=<%= node['openstack']['compute']['libvirt']['volume_group']
 sparse_logical_volumes=<%= node['openstack']['compute']['libvirt']['sparse_logical_volumes'] %>
 
 <% elsif node['openstack']['compute']['libvirt']['images_type'] == 'rbd' -%>
-images_rbd_pool=<%= node['openstack']['compute']['libvirt']['rbd']['glance']['pool'] %>
+images_rbd_pool=<%= node['openstack']['compute']['libvirt']['rbd']['nova']['pool'] %>
 images_rbd_ceph_conf=<%= node['openstack']['compute']['libvirt']['rbd']['ceph_conf'] %>
 
 #