From 760742763686d561f03768345d672935d72e49b0 Mon Sep 17 00:00:00 2001
From: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
Date: Thu, 16 Feb 2017 23:01:48 +0530
Subject: cli: deprecate volserver option

volserver can be considered as "localhost", as we anyway tieing-up
glusterd, gluster-blockd and cli processes.

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
---
 cli/gluster-block.c | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

(limited to 'cli')

diff --git a/cli/gluster-block.c b/cli/gluster-block.c
index 4b03422..440fe91 100644
--- a/cli/gluster-block.c
+++ b/cli/gluster-block.c
@@ -152,7 +152,6 @@ glusterBlockHelp(void)
       "\n"
       "commands and arguments:\n"
       "  create         <name>          create block device\n"
-      "    volserver      <gluster-node>     node addr from gluster pool\n"
       "    size           <size>             size in KiB|MiB|GiB|TiB..\n"
       "    [mpath          <count>]          multipath requirement for high availability(default: 1)\n"
       "    servers        <IP1,IP2,IP3...>   servers in the pool where targets are exported\n"
@@ -174,15 +173,13 @@ glusterBlockCreate(int argcount, char **options)
   size_t optind = 2;
   int ret = 0;
   char *out = NULL;
-  bool volserver = FALSE;
   static blockCreateCli cobj = {0, };
 
 
   if(argcount <= optind) {
     MSG("%s\n", "Insufficient arguments for create:");
     MSG("%s\n", "gluster-block create <block-name> volume <volname> "
-                "volserver <gluster-node> size <bytes> [mpath <count>]"
-                " servers <host1,host2,...>");
+                "size <bytes> [mpath <count>] servers <IP1,IP2,...>");
     return -1;
   }
 
@@ -212,11 +209,6 @@ glusterBlockCreate(int argcount, char **options)
       ret++;
       break;
 
-    case GB_CLI_CREATE_VOLSERVER:
-      strcpy(cobj.volfileserver, options[optind++]);
-      volserver = TRUE;
-      break;
-
     case GB_CLI_CREATE_MULTIPATH:
       sscanf(options[optind++], "%u", &cobj.mpath);
       break;
@@ -251,16 +243,11 @@ glusterBlockCreate(int argcount, char **options)
   if(ret < 3) {
     MSG("%s\n", "Insufficient arguments for create:");
     MSG("%s\n", "gluster-block create <block-name> volume <volname> "
-                "volserver <gluster-node> size <bytes> [mpath <count>]"
-                " servers <host1,host2,...>");
+                "size <bytes> [mpath <count>] servers <IP1,IP2,...>");
     ret = -1;
     goto out;
   }
 
-  if(!volserver) {
-    strcpy(cobj.volfileserver, "localhost");
-  }
-
   ret = glusterBlockCliRPC_1(&cobj, CREATE_CLI, &out);
 
   if(out) {
-- 
cgit