Allow configuring the rbd keyring name

claytono · claytono · commit 77fa1ce7e286 · 2014-05-21T12:40:46.000Z
Change-Id: I7342ec1337cf86c0e4bc66b1788e65c53b2878ce (cherry picked from commit cb0b480)
diff --git a/manifests/compute/rbd.pp b/manifests/compute/rbd.pp
@@ -38,12 +38,17 @@
 #   Required to use cephx.
 #   Default to false.
 #
+# [*rbd_keyring*]
+#   (optional) The keyring name to use when retrieving the RBD secret
+#   Default to 'client.nova'
+#
 
 class nova::compute::rbd (
   $libvirt_rbd_user,
   $libvirt_rbd_secret_uuid      = false,
   $libvirt_images_rbd_pool      = 'rbd',
   $libvirt_images_rbd_ceph_conf = '/etc/ceph/ceph.conf',
+  $rbd_keyring                  = 'client.nova',
 ) {
 
   include nova::params
@@ -71,7 +76,7 @@
     }
 
     exec { 'set-secret-value virsh':
-      command => '/usr/bin/virsh secret-set-value --secret $(cat /etc/nova/virsh.secret) --base64 $(ceph auth get-key client.nova)',
+      command => "/usr/bin/virsh secret-set-value --secret $(cat /etc/nova/virsh.secret) --base64 $(ceph auth get-key ${rbd_keyring})",
       require => Exec['get-or-set virsh secret']
     }
 
diff --git a/spec/classes/nova_compute_rbd_spec.rb b/spec/classes/nova_compute_rbd_spec.rb
@@ -50,7 +50,7 @@
         )
       end
 
-      it 'configure nova.conf with overriden parameters' do
+      it 'configure nova.conf with overridden parameters' do
           should contain_nova_config('libvirt/images_type').with_value('rbd')
           should contain_nova_config('libvirt/images_rbd_pool').with_value('AnotherPool')
           should contain_nova_config('libvirt/images_rbd_ceph_conf').with_value('/tmp/ceph.conf')
@@ -61,7 +61,8 @@
     context 'when using cephx' do
       before :each do
         params.merge!(
-          :libvirt_rbd_secret_uuid => 'UUID'
+          :libvirt_rbd_secret_uuid => 'UUID',
+          :rbd_keyring             => 'client.rbd_test'
         )
       end
 
@@ -84,7 +85,7 @@
           :require => 'File[/etc/nova/secret.xml]'
         )
         should contain_exec('set-secret-value virsh').with(
-          :command => "/usr/bin/virsh secret-set-value --secret $(cat /etc/nova/virsh.secret) --base64 $(ceph auth get-key client.nova)"
+          :command => "/usr/bin/virsh secret-set-value --secret $(cat /etc/nova/virsh.secret) --base64 $(ceph auth get-key client.rbd_test)"
         )
       end
     end

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@`
`50`	`50`	`)`
`51`	`51`	`end`
`52`	`52`
`53`		`- it 'configure nova.conf with overriden parameters' do`
	`53`	`+ it 'configure nova.conf with overridden parameters' do`
`54`	`54`	`should contain_nova_config('libvirt/images_type').with_value('rbd')`
`55`	`55`	`should contain_nova_config('libvirt/images_rbd_pool').with_value('AnotherPool')`
`56`	`56`	`should contain_nova_config('libvirt/images_rbd_ceph_conf').with_value('/tmp/ceph.conf')`
`@@ -61,7 +61,8 @@`
`61`	`61`	`context 'when using cephx' do`
`62`	`62`	`before :each do`
`63`	`63`	`params.merge!(`
`64`		`- :libvirt_rbd_secret_uuid => 'UUID'`
	`64`	`+ :libvirt_rbd_secret_uuid => 'UUID',`
	`65`	`+ :rbd_keyring => 'client.rbd_test'`
`65`	`66`	`)`
`66`	`67`	`end`
`67`	`68`
`@@ -84,7 +85,7 @@`
`84`	`85`	`:require => 'File[/etc/nova/secret.xml]'`
`85`	`86`	`)`
`86`	`87`	`should contain_exec('set-secret-value virsh').with(`
`87`		`- :command => "/usr/bin/virsh secret-set-value --secret $(cat /etc/nova/virsh.secret) --base64 $(ceph auth get-key client.nova)"`
	`88`	`+ :command => "/usr/bin/virsh secret-set-value --secret $(cat /etc/nova/virsh.secret) --base64 $(ceph auth get-key client.rbd_test)"`
`88`	`89`	`)`
`89`	`90`	`end`
`90`	`91`	`end`