summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com.gluster.storage.management.console.help/META-INF/MANIFEST.MF3
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/change_password.html8
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_client.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_gmg.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/cifs_service.html15
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/configure_cifs.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/gmc_install_overview.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/gmg_install_overview.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic (4).html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (3).html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (4).html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic.html24
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/manage_logs.html21
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/manage_volumes.html21
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/setting_the_gmc.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic (3) - Copy.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic (3).html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic.html24
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (2).html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (3).html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_1.0_create_cluster.jpgbin0 -> 12353 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_1.0_login.jpgbin0 -> 14542 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols.jpgbin0 -> 12508 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols_confirm.jpgbin0 -> 11321 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_1.0_register_cluster.jpgbin0 -> 15437 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_1.0_select_cluster.jpgbin0 -> 18303 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_1.0_server_add_success.jpgbin0 -> 10640 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_Add_Server_Manual.jpgbin0 -> 11525 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_Confirm.jpgbin0 -> 17356 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_Log_list.jpgbin0 -> 171345 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_Remove_Brick_Confirm.jpgbin0 -> 19955 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_Remove_server.jpgbin0 -> 12370 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_Single_Vol.jpgbin0 -> 13304 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_Stop_Multiple_Vol.jpgbin0 -> 14017 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_Stop_Vol.jpgbin0 -> 12503 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_Vol_List.jpgbin0 -> 67235 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_Vol_Options.jpgbin0 -> 80035 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_Vol_rebalance_success.jpgbin0 -> 12603 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_create_vol (2).jpgbin0 -> 44511 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_create_vol.jpgbin0 -> 44511 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_log_criteria.jpgbin0 -> 117809 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_migrate_brick.jpgbin0 -> 60009 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/GMC_remove_server_confirm.jpgbin0 -> 11560 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/Migration.pngbin0 -> 126167 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/Running tasks & alerts.pngbin0 -> 131944 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/images/discovered_servers.pngbin0 -> 80490 bytes
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/access_gmc_jws.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/add_servers.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/create_cluster.html25
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/create_volume.html2
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/delete_volume.html27
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/deploy_gmc_dedicated_host.html34
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/display_log.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/download_log.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/initialize_disk.html22
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/maintopic (3).html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/maintopic.html24
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/migrate_brick.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/rebalance_vol.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/register_cluster.html25
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/remove_server.html23
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/select_cluster.html25
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/start_vol.html2
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/starting_gmc.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/stop_vol.html2
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/subtopic.html25
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/subtopic2 (3).html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/subtopic2.html24
-rw-r--r--src/com.gluster.storage.management.console.help/plugin.xml3
-rw-r--r--src/com.gluster.storage.management.console.help/toc.xml6
-rw-r--r--src/com.gluster.storage.management.console.help/tocgettingstarted.xml2
-rw-r--r--src/com.gluster.storage.management.console.help/toctasks.xml40
-rw-r--r--src/com.gluster.storage.management.gateway.scripts/src/Utils.py16
-rw-r--r--src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py16
-rw-r--r--src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/AuditFilter.java2
-rw-r--r--src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/SshUtil.java7
77 files changed, 649 insertions, 118 deletions
diff --git a/src/com.gluster.storage.management.console.help/META-INF/MANIFEST.MF b/src/com.gluster.storage.management.console.help/META-INF/MANIFEST.MF
index 2bfb3270..7795e50d 100644
--- a/src/com.gluster.storage.management.console.help/META-INF/MANIFEST.MF
+++ b/src/com.gluster.storage.management.console.help/META-INF/MANIFEST.MF
@@ -5,4 +5,5 @@ Bundle-SymbolicName: com.gluster.storage.management.console.help; singleton:=tru
Bundle-Version: 1.0.0
Bundle-Vendor: GLUSTER
Require-Bundle: org.eclipse.help.ui;bundle-version="3.5.2",
- org.eclipse.help.webapp;bundle-version="3.5.2"
+ org.eclipse.help.webapp;bundle-version="3.5.2",
+ org.eclipse.help
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/change_password.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/change_password.html
index c029629f..7669805f 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/change_password.html
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/change_password.html
@@ -17,15 +17,17 @@ Gluster Management Console assigns a default password (gluster) to control acces
<p> A login window is displayed.</p>
<p><img src="../images/GMC_change_pwd.jpg"alt="Change Default Password"/></p>
<li>Type your current password in the Old Password field.
-<p> The default system-assigned password is gluster.</p>
+<p> The default system-assigned password is syst3m.</p>
<li>Type your new password in the New Password field.
<li>Retype your new password in the Confirm Password field.
<li>Click Change. The system displays Change Password window indicating that the password was successfully changed.
<p><img src="../images/GMC_pwd_change_success.jpg"alt="Password Changed Successfully"/></p>
<li>Click OK.
-
-
</ol>
+<h2>Resetting the Passowrd</h2>
+If you
+ew script available as /opt/glustermg/1.0.0/scripts/gmg-reset-password.sh
+
<p>
</body>
</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_client.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_client.html
new file mode 100644
index 00000000..c2a0c04f
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_client.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Main Topic</title>
+</head>
+
+<body>
+<h1>Checking the Minimum Requirements of Client Machines</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_gmg.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_gmg.html
new file mode 100644
index 00000000..646bfd67
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_gmg.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Main Topic</title>
+</head>
+
+<body>
+<h1>Checking Gluster Management Gateway Minimum Requirements</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/cifs_service.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/cifs_service.html
new file mode 100644
index 00000000..777a82e7
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/cifs_service.html
@@ -0,0 +1,15 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic</title>
+</head>
+
+<body>
+<h1>CIFS Services</h1>
+The Common Internet File System (CIFS), also known as Server Message Block (SMB), is a network protocol whose most common use is sharing files on a Local Area Network (LAN). The protocol allows a client to manipulate files just as if they were on the local computer. Operations such as read, write, create, delete, and rename are all supported &#45; the only difference being that the files are not on the local computer and are actually on a remote server.
+<p> The CIFS protocol works by sending packets from the client to the server. Each packet is typically a basic request of some kind, such as open file, close file, or read file. The server then receives the packet, checks to see if the request is legal, verifies the client has the appropriate file permissions, and finally executes the request and returns a response packet to the client. The client then parses the response packet and can determine whether or not the initial request was successful.</p>
+<p> The CIFS protocol is most commonly used with Microsoft operating systems. Windows For Workgroups was the first Microsoft operating system to use CIFS, and each Microsoft operating system since then has been able to function as both a CIFS server and client.</p>
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/configure_cifs.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/configure_cifs.html
new file mode 100644
index 00000000..b93b0c8f
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/configure_cifs.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Main Topic</title>
+</head>
+
+<body>
+<h1>Configuring </h1><h2>Configuring CIFS Services on Your Cluster</h2>
+The SMB/CIFS server is configured via the file-servers.xml file in the WEB-INF\classes\alfresco folder
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/gmc_install_overview.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/gmc_install_overview.html
new file mode 100644
index 00000000..283f8165
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/gmc_install_overview.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Main Topic</title>
+</head>
+
+<body>
+<h1>Gluster Management Console Installation Overview</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/gmg_install_overview.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/gmg_install_overview.html
new file mode 100644
index 00000000..5663b2d0
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/gmg_install_overview.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Main Topic</title>
+</head>
+
+<body>
+<h1>Gluster Management Gateway Installation Overview</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic (4).html b/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic (4).html
new file mode 100644
index 00000000..dccb80ab
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic (4).html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Main Topic</title>
+</head>
+
+<body>
+<h1>Main Topic</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (3).html b/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (3).html
new file mode 100644
index 00000000..dccb80ab
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (3).html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Main Topic</title>
+</head>
+
+<body>
+<h1>Main Topic</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (4).html b/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (4).html
new file mode 100644
index 00000000..dccb80ab
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (4).html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Main Topic</title>
+</head>
+
+<body>
+<h1>Main Topic</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy.html
new file mode 100644
index 00000000..dccb80ab
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Main Topic</title>
+</head>
+
+<body>
+<h1>Main Topic</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic.html
index a476078a..dccb80ab 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic.html
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic.html
@@ -1,13 +1,13 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Main Topic</title>
-</head>
-
-<body>
-<h1>Main Topic</h1>
-Please enter your text here.
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Main Topic</title>
+</head>
+
+<body>
+<h1>Main Topic</h1>
+Please enter your text here.
+</body>
</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_logs.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_logs.html
new file mode 100644
index 00000000..9544d1e5
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_logs.html
@@ -0,0 +1,21 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Managing Logs</title>
+</head>
+
+<body>
+<h1>Managing Logs</h1>
+You can use the Logs tab of your Management Console to download the gateway, server, volumes, and UI logs to your local machine to analyze and archive.
+<p>Typically, the log file includes:</p>
+<ul>
+<li>Installation messages
+<li>Removal messages
+<li>Configuration messages
+<li>Informational messages
+</ul>
+<p>The default location for this log file is &lt;need this information&gt;.</p>
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_volumes.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_volumes.html
index 2f9e13dc..61e30f7b 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_volumes.html
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_volumes.html
@@ -13,6 +13,25 @@
</li><li>Start a volume that is currently stopped
</li><li>Stop a volume that is currently running
</li><li>Migrate a volume
- </li><li>Delete a volume from your storage environment </li></ul>
+ </li><li>Delete a volume from your storage environment </li>
+ </ul>
+ <p><b>Assigning Volume Names</b></p>
+
+<p>You can name your volumes anything you choose, subject to a few restrictions:
+<ul>
+<li>Volume names can be up to <b>?? need info here</b> characters in length. The maximum length for volume names is 32 characters.
+ <p>It is best to assign volume names that indicate the type of data they contain, and to use similar names for volumes with similar contents. It is also helpful if the volume name is similar to (or at least has elements in common with) the name of the directory at which it is mounted. Understanding the pattern then enables you accurately to guess what a volume contains and where it is mounted.</p>
+</ul>
+<p><b>Types of Volumes</b></p>
+<p>Volumes of the following types can be created in your storage environment:</p>
+<ul>
+<li>Plain Distributed - Distributes files throughout the bricks in the volume.
+<li>Distributed Striped - Distributes data across striped bricks in the volume.
+<li>Distributed Mirror - Creates a mirrored volume with all files replicated.
+<p><b>Note:</b> You must have at least two servers to activate this feature.</p>
+</ul>
+<h2>Volume Summary</h2>
+<p>The console also enables you to monitor the volumes in your cluster from the Summary tab. To display the summary of your volumes, click the Volume node from the left pane of the console window. The summary of the volumes is displayed in the right pane of the console window. It also displays Running Tasks and Alerts of all the volumes.
+<p><img src="../images/GMC_Vol_summary.jpg"alt="Volume Summary"/>
</body>
</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_the_gmc.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_the_gmc.html
new file mode 100644
index 00000000..18a8f857
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_the_gmc.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Main Topic</title>
+</head>
+
+<body>
+<h1>Setting up the Management Console</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic (3) - Copy.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic (3) - Copy.html
new file mode 100644
index 00000000..6dccc35e
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic (3) - Copy.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic</title>
+</head>
+
+<body>
+<h1>Sub Topic</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic (3).html b/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic (3).html
new file mode 100644
index 00000000..6dccc35e
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic (3).html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic</title>
+</head>
+
+<body>
+<h1>Sub Topic</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic.html
index 8a61c501..6dccc35e 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic.html
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic.html
@@ -1,13 +1,13 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Sub Topic</title>
-</head>
-
-<body>
-<h1>Sub Topic</h1>
-Please enter your text here.
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic</title>
+</head>
+
+<body>
+<h1>Sub Topic</h1>
+Please enter your text here.
+</body>
</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (2).html b/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (2).html
new file mode 100644
index 00000000..5ece5749
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (2).html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic 2</title>
+</head>
+
+<body>
+<h1>Sub Topic 2</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (3).html b/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (3).html
new file mode 100644
index 00000000..5ece5749
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (3).html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic 2</title>
+</head>
+
+<body>
+<h1>Sub Topic 2</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_create_cluster.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_create_cluster.jpg
new file mode 100644
index 00000000..66ac694e
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_create_cluster.jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_login.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_login.jpg
new file mode 100644
index 00000000..282c1407
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_login.jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols.jpg
new file mode 100644
index 00000000..e2aee777
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols.jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols_confirm.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols_confirm.jpg
new file mode 100644
index 00000000..af7ba50a
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols_confirm.jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_register_cluster.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_register_cluster.jpg
new file mode 100644
index 00000000..6e39bc31
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_register_cluster.jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_select_cluster.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_select_cluster.jpg
new file mode 100644
index 00000000..383aa719
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_select_cluster.jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_server_add_success.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_server_add_success.jpg
new file mode 100644
index 00000000..0f7dbfc5
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_server_add_success.jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_Server_Manual.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_Add_Server_Manual.jpg
new file mode 100644
index 00000000..7789034c
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_Add_Server_Manual.jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_Confirm.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_Confirm.jpg
new file mode 100644
index 00000000..c6fc98f2
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_Confirm.jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Log_list.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_Log_list.jpg
new file mode 100644
index 00000000..81ffa36c
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_Log_list.jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_Brick_Confirm.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_Brick_Confirm.jpg
new file mode 100644
index 00000000..45529823
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_Brick_Confirm.jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_server.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_server.jpg
new file mode 100644
index 00000000..b53bd949
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_server.jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Single_Vol.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_Single_Vol.jpg
new file mode 100644
index 00000000..b88c3030
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_Single_Vol.jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Stop_Multiple_Vol.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_Stop_Multiple_Vol.jpg
new file mode 100644
index 00000000..cdf8f2f8
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_Stop_Multiple_Vol.jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Stop_Vol.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_Stop_Vol.jpg
new file mode 100644
index 00000000..f6fd4f3b
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_Stop_Vol.jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Vol_List.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_Vol_List.jpg
new file mode 100644
index 00000000..04813d79
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_Vol_List.jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Vol_Options.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_Vol_Options.jpg
new file mode 100644
index 00000000..36d99160
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_Vol_Options.jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Vol_rebalance_success.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_Vol_rebalance_success.jpg
new file mode 100644
index 00000000..1d06d499
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_Vol_rebalance_success.jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_create_vol (2).jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_create_vol (2).jpg
new file mode 100644
index 00000000..63f9cf9e
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_create_vol (2).jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_create_vol.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_create_vol.jpg
new file mode 100644
index 00000000..63f9cf9e
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_create_vol.jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_log_criteria.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_log_criteria.jpg
new file mode 100644
index 00000000..112af00e
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_log_criteria.jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_migrate_brick.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_migrate_brick.jpg
new file mode 100644
index 00000000..08b4d358
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_migrate_brick.jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_remove_server_confirm.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_remove_server_confirm.jpg
new file mode 100644
index 00000000..a7c1d8ed
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/GMC_remove_server_confirm.jpg
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/Migration.png b/src/com.gluster.storage.management.console.help/html/images/Migration.png
new file mode 100644
index 00000000..4ed6e054
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/Migration.png
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/Running tasks & alerts.png b/src/com.gluster.storage.management.console.help/html/images/Running tasks & alerts.png
new file mode 100644
index 00000000..7f3b192f
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/Running tasks & alerts.png
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/images/discovered_servers.png b/src/com.gluster.storage.management.console.help/html/images/discovered_servers.png
new file mode 100644
index 00000000..2a4e2c5c
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/images/discovered_servers.png
Binary files differ
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/access_gmc_jws.html b/src/com.gluster.storage.management.console.help/html/tasks/access_gmc_jws.html
new file mode 100644
index 00000000..e448dd43
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/tasks/access_gmc_jws.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic</title>
+</head>
+
+<body>
+<h1>Accessing the Gluster Management Console Using Java Web Start</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/add_servers.html b/src/com.gluster.storage.management.console.help/html/tasks/add_servers.html
index 760ed812..22bc7e4c 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/add_servers.html
+++ b/src/com.gluster.storage.management.console.help/html/tasks/add_servers.html
@@ -7,8 +7,17 @@
</head>
<body>
-<h1>Add a Server</h1>
-Gluster Management Console enables you to manage your storage cluster with ease. This section describes how you can manage your server.
+<h1>Adding Servers</h1>
+Gluster Management Console discovers servers across the environment. You can add servers manually or from the discovered list of servers to your cloud environment to expand the amount of available storage
+<p>To add a server or a discovered server, perform the following steps:</p>
+<ol>
+<li>Choose from the menu, toolbar, or right click on the Discovered Server node and select <b>Add Server</b>.
+<p><img src="../images/discovered_servers.png"alt="Add Servers"/>
+<li>The console displays the <b>Add Server(s) to Cluster</b> window to indicate that the server was successfully added to the cluster.
+<p><img src="../images/GMC_1.0_server_add_success.jpg"alt="Add Servers"/></p>
+<li>Click <b>OK</b>.
+
+</ol>
<ul>
<li>Add a new server to the storage cluster
<li>Reboot the server, as required
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/create_cluster.html b/src/com.gluster.storage.management.console.help/html/tasks/create_cluster.html
new file mode 100644
index 00000000..ce6fa678
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/tasks/create_cluster.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Create Cluster</title>
+</head>
+
+<body>
+<h1>Create Cluster</h1>
+You can use Gluster Management Console to create and manage virtual machines and resources on GlusterFS. To create a cluster, perform the following steps.
+<ol>
+<li>Open your web browser.
+<li>Type the following URL in your web browser:</li>
+<p>http://server-name:webserver-port/glustermg/gluster-management-console.jnlp in your browser.</p>
+<p>A login window is displayed.</p>
+<p><img src="../images/GMC_1.0_login.jpg" alt="Login Window"/>
+<li>Type the user name and password in the login window and click <b>Login</b>.
+<p>Select Cluster window is displayed.</p>
+<p><img src="../images/GMC_1.0_create_cluster.jpg" alt="Create Cluster"/>
+<li>Select <b>Create</b>. Type the name of the new cluster in the <b>Cluster Name</b> field.
+<li>Click <b>OK</b>. The Gluster Management Console window is displayed with the newly created cluster
+</ol>
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/create_volume.html b/src/com.gluster.storage.management.console.help/html/tasks/create_volume.html
index bc2d498a..f99c7ae0 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/create_volume.html
+++ b/src/com.gluster.storage.management.console.help/html/tasks/create_volume.html
@@ -13,7 +13,7 @@ You can use the Management Console to create and start new volumes featuring a s
<li>Choose from the menu, toolbar, or right click and select the Volume and select Create Volume.
<p>The Create Volume window is displayed.
-<p><img src="../images/GMC_1.0_Create_Vol.jpg"alt="Volume Created Successfuly"/></p>
+<p><img src="../images/GMC_1.0_Create_Vol.jpg"alt="Create Volume"/></p>
<li>Enter the name of the volume in the Name field.
<li>Select the type of the volume from the Type drop-down list. You can choose the type as either Plain Distribute, Distributed Mirror, or Distributed Stripe.
<li>Bricks will be created on all the disks of the cluster when you create a volume, by default. Click Customize, to select and add specific bricks to your volume.
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/delete_volume.html b/src/com.gluster.storage.management.console.help/html/tasks/delete_volume.html
new file mode 100644
index 00000000..441e0ab5
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/tasks/delete_volume.html
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Main Topic</title>
+</head>
+
+<body>
+<h1>Deleting a Volume </h1>
+You can delete a volume from your storage environment, as required.
+<p>To delete a volume, perform the following steps.</p>
+<ol>
+<li>Choose from the menu, toolbar, or right click and select the Volume and select <b>Delete Volume</b>.
+<p>The <b>Delete Volume</b> window appears. If the volume is currently running, you are asked to confirm before proceeding with the volume deletion
+<p><img src="../images/GMC_Delete_Vol_Confirm.jpg"alt="Delete Volume"/></p>
+<li>If you wish to delete the volume permanently, click Delete Volume and Data.
+<li>If you wish to keep the data but delete the volume, click Delete Volume, Keep Data.
+<p>The Delete Volume window is displayed indicating that the volume was deleted successfully.</p>
+<p><p><img src="../images/GMC_Delete_Vol_Confirm.jpg"alt="Create Volume"/></p>
+
+<li>Click <b>OK</b>.
+</ol>
+
+
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/deploy_gmc_dedicated_host.html b/src/com.gluster.storage.management.console.help/html/tasks/deploy_gmc_dedicated_host.html
new file mode 100644
index 00000000..0f37c737
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/tasks/deploy_gmc_dedicated_host.html
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic</title>
+</head>
+
+<body>
+<h1>Deploying Gluster Management Console on a Dedicated Host</h1>
+You can display the server logs using the Management Console.
+
+The following table describes the information displayed when viewing logs:<table>
+
+ <tr>
+ <td>Date </td>
+ <td>The date of the log entry</td>
+ </tr>
+ <tr>
+ <td>Time </td>
+ <td>The time of the log entry</td>
+ </tr>
+ <tr>
+ <td>Type </td>
+ <td>The type of the log entry; either Normal or Error</td>
+ </tr>
+ <tr>
+ <td>Details </td>
+ <td>Details about the log entry</td>
+ </tr>
+</table>
+<p>
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/display_log.html b/src/com.gluster.storage.management.console.help/html/tasks/display_log.html
new file mode 100644
index 00000000..a476078a
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/tasks/display_log.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Main Topic</title>
+</head>
+
+<body>
+<h1>Main Topic</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/download_log.html b/src/com.gluster.storage.management.console.help/html/tasks/download_log.html
new file mode 100644
index 00000000..a476078a
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/tasks/download_log.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Main Topic</title>
+</head>
+
+<body>
+<h1>Main Topic</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/initialize_disk.html b/src/com.gluster.storage.management.console.help/html/tasks/initialize_disk.html
new file mode 100644
index 00000000..b2c11d8a
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/tasks/initialize_disk.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic</title>
+</head>
+
+<body>
+<h1>Initializing a Disk</h1>
+To initialize a disk, perform the following steps.
+<ol>
+<li>In the left pane of the console window, select the <b>Server</b> node.
+<p>The <b>Summary</b> tab displays all the disks</p>
+<li>Select the server to format.
+<li>Click Initialize Disk. The selected disk begins formatting and displays the current status
+<li>
+
+
+</ol>
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/maintopic (3).html b/src/com.gluster.storage.management.console.help/html/tasks/maintopic (3).html
new file mode 100644
index 00000000..dccb80ab
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/tasks/maintopic (3).html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Main Topic</title>
+</head>
+
+<body>
+<h1>Main Topic</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/maintopic.html b/src/com.gluster.storage.management.console.help/html/tasks/maintopic.html
index a476078a..dccb80ab 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/maintopic.html
+++ b/src/com.gluster.storage.management.console.help/html/tasks/maintopic.html
@@ -1,13 +1,13 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Main Topic</title>
-</head>
-
-<body>
-<h1>Main Topic</h1>
-Please enter your text here.
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Main Topic</title>
+</head>
+
+<body>
+<h1>Main Topic</h1>
+Please enter your text here.
+</body>
</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/migrate_brick.html b/src/com.gluster.storage.management.console.help/html/tasks/migrate_brick.html
new file mode 100644
index 00000000..a476078a
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/tasks/migrate_brick.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Main Topic</title>
+</head>
+
+<body>
+<h1>Main Topic</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/rebalance_vol.html b/src/com.gluster.storage.management.console.help/html/tasks/rebalance_vol.html
new file mode 100644
index 00000000..91fcd22d
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/tasks/rebalance_vol.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic</title>
+</head>
+
+<body>
+<h1>Rebalancing Volumes</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/register_cluster.html b/src/com.gluster.storage.management.console.help/html/tasks/register_cluster.html
new file mode 100644
index 00000000..0867c218
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/tasks/register_cluster.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Register Cluster</title>
+</head>
+
+<body>
+<h1>Register Cluster</h1>
+To register a cluster, perform the following steps.
+<ol>
+<li>Open your web browser.
+<li>Type the following URL in your web browser:</li>
+<p>http://server-name:webserver-port/glustermg/gluster-management-console.jnlp in your browser.</p>
+<p>A login window is displayed.</p>
+<p><img src="../images/GMC_1.0_login.jpg" alt="Login Window"/>
+<li>Type the user name and password in the login window and click <b>Login</b>.
+<p>Select Cluster window is displayed.</p>
+<p><img src="../images/GMC_1.0_register_cluster.jpg" alt="Register Cluster"/>
+<li>Select <b>Register</b>. Type the name of the cluster and server name in the respective fields.
+<li>Click <b>OK</b>. The Gluster Management Console window is displayed with the newly registered cluster
+</ol>
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/remove_server.html b/src/com.gluster.storage.management.console.help/html/tasks/remove_server.html
new file mode 100644
index 00000000..35996998
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/tasks/remove_server.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic</title>
+</head>
+
+<body>
+<h1>Removing a Server</h1>
+You can remove the server, as required.
+<p>To remove a server, perform the following steps:</p>
+<ol>
+<li>Choose from the menu, toolbar, or right click on the selected Server and select <b>Remove Server</b>.
+<li>If the server is currently running, you are asked to confirm before removing a server.
+<p><img src="../images/GMC_Remove_server.jpg"alt="Remove Server Confirmation"/>
+<li>Click <b>Yes</b>. The console displays the following window to indicate that the server was successfully removed.
+<p><img src="../images/GMC_remove_server_confirm.jpg"alt="Remove Server"/>
+<li>Click <b>OK</b>. The removed server is listed under Discovered Server node
+</ol>
+.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/select_cluster.html b/src/com.gluster.storage.management.console.help/html/tasks/select_cluster.html
new file mode 100644
index 00000000..9118ee77
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/tasks/select_cluster.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic 2</title>
+</head>
+
+<body>
+<h1>Select Cluster</h1>
+To select a cluster, perform the following steps.
+<ol>
+<li>Open your web browser.
+<li>Type the following URL in your web browser:</li>
+<p>http://server-name:webserver-port/glustermg/gluster-management-console.jnlp in your browser.</p>
+<p>A login window is displayed.</p>
+<p><img src="../images/GMC_1.0_login.jpg" alt="Login Window"/>
+<li>Type the user name and password in the login window and click <b>Login</b>.
+<p>Select Cluster window is displayed.</p>
+<p><img src="../images/GMC_1.0_select_cluster.jpg" alt="Select Cluster"/>
+<li>Select <b>Select</b>. Select the cluster name from the <b>Cluster Name</b> drop down list.
+<li>Click <b>OK</b>. The Gluster Management Console window displays the selected cluster.
+</ol>
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/start_vol.html b/src/com.gluster.storage.management.console.help/html/tasks/start_vol.html
index 0b427eee..36161154 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/start_vol.html
+++ b/src/com.gluster.storage.management.console.help/html/tasks/start_vol.html
@@ -7,7 +7,7 @@
</head>
<body>
-<h1>Start a Volume</h1>
+<h1>Starting a Volume</h1>
You can start a volume that is currently stopped, as required.
<p>To start a volume, perform the following steps:</p>
<ol>
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/starting_gmc.html b/src/com.gluster.storage.management.console.help/html/tasks/starting_gmc.html
new file mode 100644
index 00000000..2cc1c500
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/tasks/starting_gmc.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic</title>
+</head>
+
+<body>
+<h1>Starting the Gluster Management Gateway</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/stop_vol.html b/src/com.gluster.storage.management.console.help/html/tasks/stop_vol.html
index c91fc600..d7c9d606 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/stop_vol.html
+++ b/src/com.gluster.storage.management.console.help/html/tasks/stop_vol.html
@@ -11,7 +11,7 @@
You can stop volumes, as needed, while the cluster is online and available. For example, you might need to remove a brick that has become inaccessible in a distributed volume due to hardware or network failure.
<p>You can stop a volume that is currently running, as required. To stop a volume, perform the following steps.
<ol>
-<li>1. Choose from the menu, toolbar, or right click and select and select Stop Volume. If the volume is currently running, you are asked to confirm before stopping a volume.
+<li>Choose from the menu, toolbar, or right click and select and select Stop Volume. If the volume is currently running, you are asked to confirm before stopping a volume.
<li>Select Stop Volume.
<p> The following dialog appears indicating that the volume (or volumes) were successfully stopped.</p>
<p> Insert Screenshot.
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/subtopic.html b/src/com.gluster.storage.management.console.help/html/tasks/subtopic.html
index 21ded1cd..6dccc35e 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/subtopic.html
+++ b/src/com.gluster.storage.management.console.help/html/tasks/subtopic.html
@@ -7,28 +7,7 @@
</head>
<body>
-<h1>Displaying a Log</h1>
-You can display the server logs using the Management Console.
-
-The following table describes the information displayed when viewing logs:<table>
-
- <tr>
- <td>Date </td>
- <td>The date of the log entry</td>
- </tr>
- <tr>
- <td>Time </td>
- <td>The time of the log entry</td>
- </tr>
- <tr>
- <td>Type </td>
- <td>The type of the log entry; either Normal or Error</td>
- </tr>
- <tr>
- <td>Details </td>
- <td>Details about the log entry</td>
- </tr>
-</table>
-<p>
+<h1>Sub Topic</h1>
+Please enter your text here.
</body>
</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/subtopic2 (3).html b/src/com.gluster.storage.management.console.help/html/tasks/subtopic2 (3).html
new file mode 100644
index 00000000..5ece5749
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/tasks/subtopic2 (3).html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic 2</title>
+</head>
+
+<body>
+<h1>Sub Topic 2</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/subtopic2.html b/src/com.gluster.storage.management.console.help/html/tasks/subtopic2.html
index 86bcbf9c..5ece5749 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/subtopic2.html
+++ b/src/com.gluster.storage.management.console.help/html/tasks/subtopic2.html
@@ -1,13 +1,13 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Sub Topic 2</title>
-</head>
-
-<body>
-<h1>Sub Topic 2</h1>
-Please enter your text here.
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic 2</title>
+</head>
+
+<body>
+<h1>Sub Topic 2</h1>
+Please enter your text here.
+</body>
</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/plugin.xml b/src/com.gluster.storage.management.console.help/plugin.xml
index 0b62d954..13c39574 100644
--- a/src/com.gluster.storage.management.console.help/plugin.xml
+++ b/src/com.gluster.storage.management.console.help/plugin.xml
@@ -18,7 +18,8 @@
file="tocreference.xml">
</toc>
<toc
- file="toctasks.xml">
+ file="toctasks.xml"
+ primary="true">
</toc>
</extension>
diff --git a/src/com.gluster.storage.management.console.help/toc.xml b/src/com.gluster.storage.management.console.help/toc.xml
index 1701d6c7..99a3ff5c 100644
--- a/src/com.gluster.storage.management.console.help/toc.xml
+++ b/src/com.gluster.storage.management.console.help/toc.xml
@@ -2,12 +2,12 @@
<?NLS TYPE="org.eclipse.help.toc"?>
<toc label="Gluster Management Console - Help" topic="html/toc.html">
- <topic label="Getting Started">
- <anchor id="gettingstarted"/>
- </topic>
<topic label="Concepts">
<anchor id="concepts"/>
</topic>
+ <topic label="Getting Started">
+ <anchor id="gettingstarted"/>
+ </topic>
<topic label="Tasks">
<anchor id="tasks"/>
</topic>
diff --git a/src/com.gluster.storage.management.console.help/tocgettingstarted.xml b/src/com.gluster.storage.management.console.help/tocgettingstarted.xml
index dc535cb7..e6b8c6b4 100644
--- a/src/com.gluster.storage.management.console.help/tocgettingstarted.xml
+++ b/src/com.gluster.storage.management.console.help/tocgettingstarted.xml
@@ -12,6 +12,8 @@
<topic href="html/gettingstarted/manage_volumes.html" label="Managing Volumes">
<topic href="html/gettingstarted/manage_bricks.html" label="Managing Bricks">
</topic>
+ </topic>
+ <topic href="html/gettingstarted/manage_logs.html" label="Managing Logs">
</topic>
</toc>
diff --git a/src/com.gluster.storage.management.console.help/toctasks.xml b/src/com.gluster.storage.management.console.help/toctasks.xml
index 015ec772..0c4b4b7a 100644
--- a/src/com.gluster.storage.management.console.help/toctasks.xml
+++ b/src/com.gluster.storage.management.console.help/toctasks.xml
@@ -1,32 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<?NLS TYPE="org.eclipse.help.toc"?>
-<toc label="Tasks" link_to="toc.xml#tasks">
- <topic label="Server" href="html/tasks/servers.html">
- <topic label="Adding a Server" href="html/tasks/subtopic2.html" />
- <topic label="Removing a Server">
+<toc label="Tasks" link_to="toc.xml#tasks">
+ <topic href="html/tasks/setting_the_gmc.html" label="Setting the Gluster Management Console">
+ <topic href="html/tasks/deploy_gmc_dedicated_host.html" label="Deploying Gluster Management Console on a Dedicated Host">
+ </topic>
+ <topic href="html/tasks/starting_gmc.html" label="Starting the Gluster Management Gateway">
+ </topic>
+ <topic href="html/tasks/access_gmc_jws.html" label="Accessing the Gluster Management Console Using Java Web Start">
+ </topic>
</topic>
- <topic label="Format Disk" href="html/tasks/subtopic5.html"/>
+ <topic label="Cluster">
+ <topic href="html/tasks/create_cluster.html" label="Create a Cluster">
+ </topic>
+ <topic href="html/tasks/select_cluster.html" label="Select a Cluster">
+ </topic>
+ <topic href="html/tasks/register_cluster.html" label="Register a Cluster">
+ </topic>
+ </topic>
+ <topic label="Server">
+ <topic label="Adding Servers" href="html/tasks/add_servers.html" />
+ <topic href="html/tasks/remove_server.html" label="Removing a Server">
+ </topic>
+ <topic href="html/tasks/initialize_disk.html" label="Initializing a Disk"/>
</topic>
- <topic label="Volume" href="html/tasks/volumes.html">
+ <topic label="Volume">
<topic label="Creating a Volume" href="html/tasks/create_volume.html" />
<topic label="Starting a Volume" href="html/tasks/start_vol.html" />
- <topic label="Tuning Volume Options">
+ <topic href="html/tasks/tune_vol_opt.html" label="Tuning Volume Options">
</topic>
- <topic label="Reblancing a Volume">
+ <topic href="html/tasks/rebalance_vol.html" label="Rebalancing Volumes">
</topic>
<topic href="html/tasks/stop_vol.html" label="Stopping a Volume">
</topic>
- <topic label="Deleting a Volume">
+ <topic href="html/tasks/delete_volume.html" label="Deleting a Volume">
</topic>
<topic label="Adding a Brick" href="html/tasks/add_brick.html" />
<topic href="html/tasks/delete_brick.html" label="Deleting a Brick">
</topic>
- <topic label="Migrating a Brick">
+ <topic href="html/tasks/migrate_brick.html" label="Migrating a Brick">
</topic>
</topic>
- <topic label="Logs" href="html/tasks/logs.html">
+ <topic label="Logs">
<topic label="Displaying a Log Based on a Search Criteria" href="html/tasks/display_log.html" />
<topic label="Downloading Logs" href="html/tasks/download_log.html" />
</topic>
-</toc>
+ </toc>
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/Utils.py b/src/com.gluster.storage.management.gateway.scripts/src/Utils.py
index 46e4cdd4..82f8b7b6 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/Utils.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/Utils.py
@@ -395,26 +395,26 @@ def getCpuUsage():
def _getCpuStatList():
try:
fp = open("/proc/stat")
- cpuStatList = map(float, fp.readline().split()[1:])
+ line = fp.readline()
fp.close()
- return cpuStatList
+ return map(float, line.split()[1:5])
except IOError, e:
Utils.log("Failed to open /proc/stat: %s" % str(e))
return None
def getCpuUsageAvg():
st1 = _getCpuStatList()
- time.sleep(2)
+ #time1 = time.time()
+ time.sleep(1)
st2 = _getCpuStatList()
+ #time2 = time.time()
if not (st1 and st2):
return None
- delta = [st2[i] - st1[i] for i in range(len(st1))]
+ usageTime = (st2[0] - st1[0]) + (st2[1] - st1[1]) + (st2[2] - st1[2])
try:
- cpuPercent = sum(delta[:3]) / delta[3] * 100.0
+ return (100.0 * usageTime) / (usageTime + (st2[3] - st1[3]))
except ZeroDivisionError, e:
- log("failed to find cpu percentage:%s" % str(e))
- return None
- return str('%.4f' % cpuPercent)
+ return 0
def getLoadavg():
try:
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py
index 46e4cdd4..82f8b7b6 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py
@@ -395,26 +395,26 @@ def getCpuUsage():
def _getCpuStatList():
try:
fp = open("/proc/stat")
- cpuStatList = map(float, fp.readline().split()[1:])
+ line = fp.readline()
fp.close()
- return cpuStatList
+ return map(float, line.split()[1:5])
except IOError, e:
Utils.log("Failed to open /proc/stat: %s" % str(e))
return None
def getCpuUsageAvg():
st1 = _getCpuStatList()
- time.sleep(2)
+ #time1 = time.time()
+ time.sleep(1)
st2 = _getCpuStatList()
+ #time2 = time.time()
if not (st1 and st2):
return None
- delta = [st2[i] - st1[i] for i in range(len(st1))]
+ usageTime = (st2[0] - st1[0]) + (st2[1] - st1[1]) + (st2[2] - st1[2])
try:
- cpuPercent = sum(delta[:3]) / delta[3] * 100.0
+ return (100.0 * usageTime) / (usageTime + (st2[3] - st1[3]))
except ZeroDivisionError, e:
- log("failed to find cpu percentage:%s" % str(e))
- return None
- return str('%.4f' % cpuPercent)
+ return 0
def getLoadavg():
try:
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/AuditFilter.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/AuditFilter.java
index 1eae79fc..6218ecd9 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/AuditFilter.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/AuditFilter.java
@@ -29,7 +29,7 @@ public class AuditFilter implements ResourceFilter, ContainerRequestFilter, Cont
@Override
public ContainerRequest filter(ContainerRequest req) {
- logger.info("REQUEST: [" + req.getMethod() + "][" + req.getPath() + "]");
+ logger.info("REQUEST from [" + req.getUserPrincipal().getName() + "] : [" + req.getMethod() + "][" + req.getPath() + "]");
return req;
}
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/SshUtil.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/SshUtil.java
index 39dd42f9..7c14bf52 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/SshUtil.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/SshUtil.java
@@ -52,10 +52,9 @@ public class SshUtil {
public static final String SSH_AUTHORIZED_KEYS_DIR_REMOTE = "/root/.ssh/";
private static final String SSH_AUTHORIZED_KEYS_FILE = "authorized_keys";
private static final String SSH_AUTHORIZED_KEYS_PATH_REMOTE = SSH_AUTHORIZED_KEYS_DIR_REMOTE + SSH_AUTHORIZED_KEYS_FILE;
- public static final File PRIVATE_KEY_FILE = new File(SSH_AUTHORIZED_KEYS_DIR_LOCAL + "id_rsa");
- public static final File PUBLIC_KEY_FILE = new File(SSH_AUTHORIZED_KEYS_DIR_LOCAL + "id_rsa.pub");
+ public static final File PRIVATE_KEY_FILE = new File(SSH_AUTHORIZED_KEYS_DIR_LOCAL + "gluster.pem");
+ public static final File PUBLIC_KEY_FILE = new File(SSH_AUTHORIZED_KEYS_DIR_LOCAL + "gluster.pub");
// private static final String SCRIPT_DISABLE_SSH_PASSWORD_AUTH = "disable-ssh-password-auth.sh";
- private static final String PRIVATE_KEY_PASSPHRASE = "gluster";
private LRUCache<String, Connection> sshConnCache = new LRUCache<String, Connection>(10);
// TODO: Make user name configurable
@@ -177,7 +176,7 @@ public class SshUtil {
+ "]");
}
- if (!conn.authenticateWithPublicKey(USER_NAME, PRIVATE_KEY_FILE, PRIVATE_KEY_PASSPHRASE)) {
+ if (!conn.authenticateWithPublicKey(USER_NAME, PRIVATE_KEY_FILE, null)) {
throw new ConnectionException("SSH Authentication (public key) failed for server ["
+ conn.getHostname() + "]");
}