add rbd keyring name to secret.xml template

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
openstack · May 23, 2014 · 3f0fb20 · 3f0fb20
1 parent 77fa1ce
commit 3f0fb20
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/spec/classes/nova_compute_rbd_spec.rb b/spec/classes/nova_compute_rbd_spec.rb
@@ -74,7 +74,7 @@
         verify_contents(subject, '/etc/nova/secret.xml', [
           "<secret ephemeral=\'no\' private=\'no\'>",
           "  <usage type=\'ceph\'>",
-          "    <name>client.nova secret</name>",
+          "    <name>client.rbd_test secret</name>",
           "  </usage>",
           "  <uuid>UUID</uuid>",
           "</secret>"

diff --git a/templates/secret.xml-compute.erb b/templates/secret.xml-compute.erb
@@ -1,6 +1,6 @@
 <secret ephemeral='no' private='no'>
   <usage type='ceph'>
-    <name>client.nova secret</name>
+    <name><%= rbd_keyring %> secret</name>
   </usage>
   <uuid><%= @libvirt_rbd_secret_uuid %></uuid>
 </secret>