From 0e1aac593185e6a2b92ca079797833b3d4ddb317 Mon Sep 17 00:00:00 2001
From: Thomas Le Gentil <20202649+kifeo@users.noreply.github.com>
Date: Tue, 21 Apr 2020 16:59:25 +0200
Subject: [PATCH 1/2] changed ceph-secret-admin to be consistent with cephfs

---
 ceph/rbd/README.md             | 2 +-
 ceph/rbd/examples/class.yaml   | 2 +-
 ceph/rbd/examples/secrets.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ceph/rbd/README.md b/ceph/rbd/README.md
index f51b83ac93d..83b281822f3 100644
--- a/ceph/rbd/README.md
+++ b/ceph/rbd/README.md
@@ -32,7 +32,7 @@ See https://kubernetes.io/.
 
 ```bash
 ceph auth get client.admin 2>&1 |grep "key = " |awk '{print  $3'} |xargs echo -n > /tmp/key
-kubectl create secret generic ceph-admin-secret --from-file=/tmp/key --namespace=kube-system --type=kubernetes.io/rbd
+kubectl create secret generic ceph-secret-admin --from-file=/tmp/key --namespace=kube-system --type=kubernetes.io/rbd
 ```
 
 * Create a Ceph pool and a user secret
diff --git a/ceph/rbd/examples/class.yaml b/ceph/rbd/examples/class.yaml
index cd6de6f8b45..36534df71d1 100644
--- a/ceph/rbd/examples/class.yaml
+++ b/ceph/rbd/examples/class.yaml
@@ -8,7 +8,7 @@ parameters:
   pool: kube
   adminId: admin
   adminSecretNamespace: kube-system
-  adminSecretName: ceph-admin-secret
+  adminSecretName: ceph-secret-admin
   userId: kube
   userSecretNamespace: kube-system
   userSecretName: ceph-secret
diff --git a/ceph/rbd/examples/secrets.yaml b/ceph/rbd/examples/secrets.yaml
index a50196c3154..2db18a682da 100644
--- a/ceph/rbd/examples/secrets.yaml
+++ b/ceph/rbd/examples/secrets.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: ceph-admin-secret
+  name: ceph-secret-admin
   namespace: kube-system
 type: "kubernetes.io/rbd"
 data:

From 06fe27a1b53e3149f7632f616e065eff069063ff Mon Sep 17 00:00:00 2001
From: Thomas Le Gentil <20202649+kifeo@users.noreply.github.com>
Date: Tue, 21 Apr 2020 18:49:30 +0200
Subject: [PATCH 2/2] added instruction to install rbd package on worker node

---
 ceph/rbd/README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ceph/rbd/README.md b/ceph/rbd/README.md
index 83b281822f3..d360680ff3a 100644
--- a/ceph/rbd/README.md
+++ b/ceph/rbd/README.md
@@ -28,6 +28,10 @@ make push
 
 See https://kubernetes.io/.
 
+* Install the rbd package on the worker nodes (fixes #1256)
+
+for example, on debian the package is ceph-common
+
 * Create a Ceph admin secret
 
 ```bash