cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [1/3] git commit: updated refs/heads/4.2 to 7fd71d7
Date Tue, 06 Aug 2013 07:53:49 GMT
Updated Branches:
  refs/heads/4.2 247ccb7b4 -> 7fd71d708


CLOUDSTACK-3211: Add help docs to S3 secondary storage configuration.

When adding an S3 secondary storage, the administrator will
now be shown help for each input field making it friendlier
to use.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7fd71d70
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7fd71d70
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7fd71d70

Branch: refs/heads/4.2
Commit: 7fd71d708a34556eb9ab168e52f4471a8c2acdc8
Parents: cc10737
Author: Thomas O'Dowd <tpodowd@cloudian.com>
Authored: Tue Aug 6 14:53:47 2013 +0900
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Tue Aug 6 13:23:36 2013 +0530

----------------------------------------------------------------------
 ui/scripts/docs.js   | 37 +++++++++++++++++++++++++++++++++++++
 ui/scripts/system.js | 17 +++++++++++++----
 2 files changed, 50 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7fd71d70/ui/scripts/docs.js
----------------------------------------------------------------------
diff --git a/ui/scripts/docs.js b/ui/scripts/docs.js
index 03318b8..bb3c4d2 100755
--- a/ui/scripts/docs.js
+++ b/ui/scripts/docs.js
@@ -660,6 +660,43 @@ cloudStack.docs = {
         desc: 'The exported path from the server',
         externalLink: ''
     },
+    // S3
+    helpS3AccessKey: {
+        desc: 'This identifies the S3 user account',
+        externalLink: ''
+    },
+    helpS3SecretKey: {
+        desc: 'The password matching the S3 Access Key',
+        externalLink: ''
+    },
+    helpS3Bucket: {
+        desc: 'The S3 bucket to store CloudStack data in. The bucket must be created and
owned by the same user identified by the S3 Access Key',
+        externalLink: ''
+    },
+    helpS3Endpoint: {
+        desc: 'The S3 server to use. Non-standard ports can be appended to the hostname as
per s3.amazonaws.com:8080',
+        externalLink: ''
+    },
+    helpS3ConnectionTimeout: {
+        desc: 'The number of milliseconds to wait when establishing an S3 connection. This
is optional',
+        externalLink: ''
+    },
+    helpS3MaxErrorRetry: {
+        desc: 'The number of times to retry S3 requests before failing. This is optional',
+        externalLink: ''
+    },
+    helpS3SocketTimeout: {
+        desc: 'The number of milliseconds to wait while reading an S3 response. This is optional',
+        externalLink: ''
+    },
+    helpNFSStagingServer: {
+        desc: 'The name or IP address of the NFS secondary staging server',
+        externalLink: ''
+    },
+    helpNFSStagingPath: {
+        desc: 'The exported path to use on the NFS staging server',
+        externalLink: ''
+    },
     // Add SRX
     helpSRXIPAddress: {
         desc: 'The IP address of the device',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7fd71d70/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 92fa867..e9ba4c6 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -14525,24 +14525,28 @@
                                             //S3 (begin)
                                             accesskey: {
                                                 label: 'label.s3.access_key',
+                                                docID: 'helpS3AccessKey',
                                                 validation: {
                                                     required: true
                                                 }
                                             },
                                             secretkey: {
                                                 label: 'label.s3.secret_key',
+                                                docID: 'helpS3SecretKey',
                                                 validation: {
                                                     required: true
                                                 }
                                             },
                                             bucket: {
                                                 label: 'label.s3.bucket',
+                                                docID: 'helpS3Bucket',
                                                 validation: {
                                                     required: true
                                                 }
                                             },
                                             endpoint: {
-                                                label: 'label.s3.endpoint'
+                                                label: 'label.s3.endpoint',
+                                                docID: 'helpS3Endpoint'
                                             },
                                             usehttps: {
                                                 label: 'label.s3.use_https',
@@ -14552,13 +14556,16 @@
                                                 converter: cloudStack.converters.toBooleanText
                                             },
                                             connectiontimeout: {
-                                                label: 'label.s3.connection_timeout'
+                                                label: 'label.s3.connection_timeout',
+                                                docID: 'helpS3ConnectionTimeout'
                                             },
                                             maxerrorretry: {
-                                                label: 'label.s3.max_error_retry'
+                                                label: 'label.s3.max_error_retry',
+                                                docID: 'helpS3MaxErrorRetry'
                                             },
                                             sockettimeout: {
-                                                label: 'label.s3.socket_timeout'
+                                                label: 'label.s3.socket_timeout',
+                                                docID: 'helpS3SocketTimeout'
                                             },
 
                                             createNfsCache: {
@@ -14602,6 +14609,7 @@
                                             nfsCacheNfsServer: {
                                                 dependsOn: 'createNfsCache',
                                                 label: 'label.nfs.server',
+                                                docID: 'helpNFSStagingServer',
                                                 validation: {
                                                     required: true
                                                 }
@@ -14609,6 +14617,7 @@
                                             nfsCachePath: {
                                                 dependsOn: 'createNfsCache',
                                                 label: 'label.path',
+                                                docID: 'helpNFSStagingPath',
                                                 validation: {
                                                     required: true
                                                 }


Mime
View raw message