From 92e044b222c6cad2dca99a6cbae47d93e9c9711d Mon Sep 17 00:00:00 2001
From: root <dgautam@juniper.net>
Date: Sat, 12 Dec 2015 03:51:26 -0800
Subject: [PATCH] SM-Storage: rectify keyring value for ceph config

Partial-Bug: #1525506

1. verified provisioning completion on problematic setup.
2. launched VM, created a voulme and attached to instances.

Change-Id: I129d0bb373c46dca8562da33bd0f35b8f2925d73
---
 .../modules/contrail/manifests/lib/storage_common.pp          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrail/environment/modules/contrail/manifests/lib/storage_common.pp b/contrail/environment/modules/contrail/manifests/lib/storage_common.pp
index 542a3274..8ac82ae7 100755
--- a/contrail/environment/modules/contrail/manifests/lib/storage_common.pp
+++ b/contrail/environment/modules/contrail/manifests/lib/storage_common.pp
@@ -105,7 +105,7 @@
             cap_mon        => 'allow *',
             cap_osd        => 'allow *',
             inject_as_id   => 'mon.',
-            inject_keyring => "/var/lib/ceph/mon/ceph-\$hostname/keyring",
+            inject_keyring => "/var/lib/ceph/mon/ceph-$hostname/keyring",
             inject         => true,
         }
         ->
@@ -114,7 +114,7 @@
             keyring_path   => '/var/lib/ceph/bootstrap-osd/ceph.keyring',
             cap_mon        => 'allow profile bootstrap-osd',
             inject_as_id   => 'mon.',
-            inject_keyring => "/var/lib/ceph/mon/ceph-\$hostname/keyring",
+            inject_keyring => "/var/lib/ceph/mon/ceph-$hostname/keyring",
             inject         => true,
         }
     } else {