Merge "SM-Storage: rectify keyring value for ceph config"

Juniper · Dec 16, 2015 · 8796e50 · 8796e50
2 parents 58c777c + 92e044b
commit 8796e50
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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 {