From b9c13d0e738a38732d50449eb646d294c326aeb1 Mon Sep 17 00:00:00 2001
From: Wido den Hollander <wido@42on.com>
Date: Thu, 26 Sep 2013 09:47:59 +0200
Subject: [PATCH] rbd: Add more help information to the UI when adding a
 Primary Pool.

---
 .../classes/resources/messages.properties        |  7 ++++++-
 ui/dictionary.jsp                                |  4 ++++
 ui/scripts/docs.js                               | 16 ++++++++++++++++
 ui/scripts/system.js                             |  4 ++++
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index bc1e43692a3..48c6b397b1f 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -39,7 +39,7 @@ message.acquire.ip.nic=Please confirm that you would like to acquire a new secon
 message.select.affinity.groups=Please select any affinity groups you want this VM to belong to:
 message.no.affinity.groups=You do not have any affinity groups. Please continue to the next step.
 label.action.delete.nic=Remove NIC
-message.action.delete.nic=Please confirm that want to remove this NIC, which will also remove the associated network from the VM. 
+message.action.delete.nic=Please confirm that want to remove this NIC, which will also remove the associated network from the VM.
 changed.item.properties=Changed item properties
 confirm.enable.s3=Please fill in the following information to enable support for S3-backed Secondary Storage
 confirm.enable.swift=Please fill in the following information to enable support for Swift
@@ -412,6 +412,11 @@ label.cluster.type=Cluster Type
 label.cluster=Cluster
 label.clusters=Clusters
 label.clvm=CLVM
+label.rbd=RBD
+label.rbd.monitor=Ceph monitor
+label.rbd.pool=Ceph pool
+label.rbd.id=Cephx user
+label.rbd.secret=Cephx secret
 label.code=Code
 label.community=Community
 label.compute.and.storage=Compute and Storage
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index 15c199964b3..f2505d32a39 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -903,6 +903,10 @@ dictionary = {
 'label.Pxe.server.type': '<fmt:message key="label.Pxe.server.type" />',
 'label.quickview': '<fmt:message key="label.quickview" />',
 'label.rbd': '<fmt:message key="label.rbd" />',
+'label.rbd.monitor': '<fmt:message key="label.rbd.monitor" />',
+'label.rbd.pool': '<fmt:message key="label.rbd.pool" />',
+'label.rbd.id': '<fmt:message key="label.rbd.id" />',
+'label.rbd.secret': '<fmt:message key="label.rbd.secret" />',
 'label.reboot': '<fmt:message key="label.reboot" />',
 'label.recent.errors': '<fmt:message key="label.recent.errors" />',
 'label.redundant.router.capability': '<fmt:message key="label.redundant.router.capability" />',
diff --git a/ui/scripts/docs.js b/ui/scripts/docs.js
index 1431c1b7b1f..3a4f8ca604f 100755
--- a/ui/scripts/docs.js
+++ b/ui/scripts/docs.js
@@ -643,6 +643,22 @@ cloudStack.docs = {
         desc: 'In iSCSI, this is the LUN number. For example, 3.',
         externalLink: ''
     },
+    helpPrimaryStorageRBDMonitor: {
+        desc: 'The address of a Ceph monitor. Can also be a Round Robin DNS record',
+        externalLink: ''
+    },
+    helpPrimaryStorageRBDPool: {
+        desc: 'The pool to use on the Ceph cluster. This pool should already exist',
+        externalLink: ''
+    },
+    helpPrimaryStorageRBDId: {
+        desc: 'The cephx user to use without the client. prefix. For example: admin',
+        externalLink: ''
+    },
+    helpPrimaryStorageRBDSecret: {
+        desc: 'The base64 encoded secret of the cephx user.',
+        externalLink: ''
+    },
     helpPrimaryStorageTags: {
         desc: 'Comma-separated list of tags for this storage device. Must be the same set or a superset of the tags on your disk offerings.',
         externalLink: ''
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 7bdd5390ab3..f5ed9a20c43 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -13113,6 +13113,7 @@
                                     // RBD
                                     rbdmonitor: {
                                         label: 'label.rbd.monitor',
+                                        docID: 'helpPrimaryStorageRBDMonitor',
                                         validation: {
                                             required: true
                                         },
@@ -13120,6 +13121,7 @@
                                     },
                                     rbdpool: {
                                         label: 'label.rbd.pool',
+                                        docID: 'helpPrimaryStorageRBDPool',
                                         validation: {
                                             required: true
                                         },
@@ -13127,6 +13129,7 @@
                                     },
                                     rbdid: {
                                         label: 'label.rbd.id',
+                                        docID: 'helpPrimaryStorageRBDId',
                                         validation: {
                                             required: false
                                         },
@@ -13134,6 +13137,7 @@
                                     },
                                     rbdsecret: {
                                         label: 'label.rbd.secret',
+                                        docID: 'helpPrimaryStorageRBDSecret',
                                         validation: {
                                             required: false
                                         },