From bda41065db4ffadae59fc77fc46a32d69ab96970 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Han?= <sebastien.han@enovance.com>
Date: Tue, 11 Feb 2014 14:14:54 +0100
Subject: [PATCH] Ceph: several fixes

Fix duplicate resources.

Closes bug: #154
---
 manifests/storage/rbd/pools.pp              | 26 ++-------------------
 templates/storage/ceph/ceph-client.conf.erb |  4 ++--
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/manifests/storage/rbd/pools.pp b/manifests/storage/rbd/pools.pp
index 0b44a37f..c35d504c 100644
--- a/manifests/storage/rbd/pools.pp
+++ b/manifests/storage/rbd/pools.pp
@@ -54,19 +54,13 @@ class cloud::storage::rbd::pools(
         require => Exec['create_cinder_volumes_pool'];
       }
 
-      concat::fragment { 'ceph-clients-os':
-        target  => '/etc/ceph/ceph.conf',
-        order   => '95',
-        content => template('cloud/storage/ceph/ceph-client.conf.erb')
-      }
-
       if $::ceph_keyring_glance {
         # NOTE(fc): Puppet needs to run a second time to enter this
         ceph::key { $glance_user:
           secret       => $::ceph_keyring_glance,
           keyring_path => "/etc/ceph/ceph.client.${glance_user}.keyring"
         } ->
-        file { '/etc/ceph/ceph.client.glance.keyring':
+        file { "/etc/ceph/ceph.client.${glance_user}.keyring":
           owner => 'glance',
           group => 'glance',
           mode  => '0400'
@@ -79,7 +73,7 @@ class cloud::storage::rbd::pools(
           secret       => $::ceph_keyring_cinder,
           keyring_path => "/etc/ceph/ceph.client.${cinder_user}.keyring"
         } ->
-        file { '/etc/ceph/ceph.client.cinder.keyring':
+        file { "/etc/ceph/ceph.client.${cinder_user}.keyring":
           owner => 'cinder',
           group => 'cinder',
           mode  => '0400'
@@ -93,22 +87,6 @@ class cloud::storage::rbd::pools(
         content => template('cloud/storage/ceph/ceph-client.conf.erb')
       }
 
-      if $::ceph_keyring_glance {
-        # NOTE(fc): Puppet needs to run a second time to enter this
-        @@ceph::key { $glance_user:
-          secret       => $::ceph_keyring_glance,
-          keyring_path => "/etc/ceph/ceph.client.${glance_user}.keyring"
-        }
-      }
-
-      if $::ceph_keyring_cinder {
-        # NOTE(fc): Puppet needs to run a second time to enter this
-        @@ceph::key { $cinder_user:
-          secret       => $::ceph_keyring_cinder,
-          keyring_path => "/etc/ceph/ceph.client.${cinder_user}.keyring"
-        }
-      }
-
 #exec { "create cinder backup pool":
 #TODO: point PG num with a cluster variable + keyring
 #  command => "/usr/bin/ceph osd pool create ${::cinder_backup_pool} 128 128",
diff --git a/templates/storage/ceph/ceph-client.conf.erb b/templates/storage/ceph/ceph-client.conf.erb
index 40c34408..7272d165 100644
--- a/templates/storage/ceph/ceph-client.conf.erb
+++ b/templates/storage/ceph/ceph-client.conf.erb
@@ -1,8 +1,8 @@
 <% if @clients %>
 <% @clients.each do |client| %>
 
-[client.<%= @client %>]
-    keyring = /etc/ceph/ceph.client.<%= @client %>.keyring
+[client.<%= client %>]
+    keyring = /etc/ceph/ceph.client.<%= client %>.keyring
 
 <% end %>
 <% end %>