From f221cbc52a1497991ef2ef2cfe5299dd5c5d3d60 Mon Sep 17 00:00:00 2001
From: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date: Tue, 20 May 2014 22:24:19 +0200
Subject: [PATCH] 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
---
 spec/classes/nova_compute_rbd_spec.rb | 2 +-
 templates/secret.xml-compute.erb      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/classes/nova_compute_rbd_spec.rb b/spec/classes/nova_compute_rbd_spec.rb
index 1605e3029..8ad304ea8 100644
--- a/spec/classes/nova_compute_rbd_spec.rb
+++ b/spec/classes/nova_compute_rbd_spec.rb
@@ -74,7 +74,7 @@ describe 'nova::compute::rbd' do
         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
index c42415961..a17d70e05 100644
--- 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>