openstack/puppet-nova
Code Issues Proposed changes

add rbd keyring name to secret.xml template

Browse Source 
With Change-Id: I7342ec1337cf86c0e4bc66b1788e65c53b2878ce
a parameter for configuring the rbd keyring name was introduced.
This parameter should be used in the secrets file also.

Change-Id: I9da148f7f2e940f1d4dec73e1df6f283028bcca1
This commit is contained in:
Benedikt Trefzer
2014-05-20 22:24:19 +02:00
parent 5683f4745c
commit f221cbc52a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/classes/nova_compute_rbd_spec.rb
View File

@@ -74,7 +74,7 @@ describe 'nova::compute::rbd' do
verify_contents(subject, '/etc/nova/secret.xml', [ verify_contents(subject, '/etc/nova/secret.xml', [
"<secret ephemeral=\'no\' private=\'no\'>", "<secret ephemeral=\'no\' private=\'no\'>",
" <usage type=\'ceph\'>", " <usage type=\'ceph\'>",
" <name>client.nova secret</name>", " <name>client.rbd_test secret</name>",
" </usage>", " </usage>",
" <uuid>UUID</uuid>", " <uuid>UUID</uuid>",
"</secret>" "</secret>"

2
templates/secret.xml-compute.erb
View File

@@ -1,6 +1,6 @@
<secret ephemeral='no' private='no'> <secret ephemeral='no' private='no'>
<usage type='ceph'> <usage type='ceph'>
<name>client.nova secret</name> <name><%= rbd_keyring %> secret</name>
</usage> </usage>
<uuid><%= @libvirt_rbd_secret_uuid %></uuid> <uuid><%= @libvirt_rbd_secret_uuid %></uuid>
</secret> </secret>