From 843e1b04b554ab887ec656ae7b468bb93ee4e2f7 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Wed, 1 Feb 2017 06:39:03 -0500 Subject: glusterd: (storhaug) remove ganesha remove all vestiges of ganesha The storhaug CLI is used to manage ganesha and Samba. Also any setup and teardown of the ganesha HA is initiated using storhaug to preserve the proper layering. Change-Id: I0eec0016a1b7802a36e7b2d92896b86fdf8607d5 BUG: 1420713 Signed-off-by: Kaleb S. KEITHLEY Reviewed-on: https://review.gluster.org/16504 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System --- cli/src/cli-cmd-parser.c | 106 ----------------------------------------------- 1 file changed, 106 deletions(-) (limited to 'cli/src/cli-cmd-parser.c') diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index e50d9f66f9..be53cd2ed4 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -818,112 +818,6 @@ out: return ret; } -/* Parsing global option for NFS-Ganesha config - * gluster nfs-ganesha enable/disable */ - -int32_t -cli_cmd_ganesha_parse (struct cli_state *state, - const char **words, int wordcount, - dict_t **options, char **op_errstr) -{ - dict_t *dict = NULL; - int ret = -1; - char *key = NULL; - char *value = NULL; - char *w = NULL; - char *opwords[] = { "enable", "disable", NULL }; - const char *question = NULL; - gf_answer_t answer = GF_ANSWER_NO; - - - GF_ASSERT (words); - GF_ASSERT (options); - - dict = dict_new (); - - if (!dict) - goto out; - - if (wordcount != 2) - goto out; - - key = (char *) words[0]; - value = (char *) words[1]; - - if (!key || !value) { - cli_out ("Usage : nfs-ganesha "); - ret = -1; - goto out; - } - - ret = gf_strip_whitespace (value, strlen (value)); - if (ret == -1) - goto out; - - if (strcmp (key, "nfs-ganesha")) { - gf_asprintf (op_errstr, "Global option: error: ' %s '" - "is not a valid global option.", key); - ret = -1; - goto out; - } - - w = str_getunamb (value, opwords); - if (!w) { - cli_out ("Invalid global option \n" - "Usage : nfs-ganesha "); - ret = -1; - goto out; - } - - question = "Enabling NFS-Ganesha requires Gluster-NFS to be" - " disabled across the trusted pool. Do you " - "still want to continue?\n"; - - if (strcmp (value, "enable") == 0) { - answer = cli_cmd_get_confirmation (state, question); - if (GF_ANSWER_NO == answer) { - gf_log ("cli", GF_LOG_ERROR, "Global operation " - "cancelled, exiting"); - ret = -1; - goto out; - } - } - cli_out ("This will take a few minutes to complete. Please wait .."); - - ret = dict_set_str (dict, "key", key); - if (ret) { - gf_log (THIS->name, GF_LOG_ERROR, "dict set on key failed"); - goto out; - } - - ret = dict_set_str (dict, "value", value); - if (ret) { - gf_log (THIS->name, GF_LOG_ERROR, "dict set on value failed"); - goto out; - } - - ret = dict_set_str (dict, "globalname", "All"); - if (ret) { - gf_log (THIS->name, GF_LOG_ERROR, "dict set on global" - " key failed."); - goto out; - } - - ret = dict_set_int32 (dict, "hold_global_locks", _gf_true); - if (ret) { - gf_log (THIS->name, GF_LOG_ERROR, "dict set on global key " - "failed."); - goto out; - } - - *options = dict; -out: - if (ret) - dict_unref (dict); - - return ret; -} - int32_t cli_cmd_get_state_parse (struct cli_state *state, const char **words, int wordcount, -- cgit