clean up after dropping yokozuna

Author: Andrei Zavada

rel/files/riak-admin

@@ -22,7 +22,7 @@ usage() {
     echo "                    aae-status | diag | stat | status | transfer-limit | reformat-indexes |"
     echo "                    top [-interval N] [-sort reductions|memory|msg_q] [-lines N] |"
     echo "                    downgrade-objects | security | bucket-type | repair-2i |"
-    echo "                    search | services | ensemble-status | handoff | set |"
+    echo "                    services | ensemble-status | handoff | set |"
     echo "                    show | describe }"
 }
 
@@ -522,43 +522,6 @@ The following commands modify users and security ACLs for Riak:
     esac
 }
 
-search_admin()
-{
-    case "$1" in
-        aae[_-]status)
-            if [ $# -ne 1 ]; then
-                echo "Usage: $SCRIPT search $1"
-                exit 1
-            fi
-            shift
-
-            # Make sure the local node is running
-
-            $RPC_HOP yz_console aae_status "$@"
-            ;;
-        switch[_-]to[_-]new[_-]search)
-            if [ $# -ne 1 ]; then
-                echo "Usage: $SCRIPT search $1"
-                exit 1
-            fi
-            shift
-
-            # Make sure the local node is running
-
-            $RPC_HOP yz_console switch_to_new_search "$@"
-            ;;
-        *)
-echo "\
-Usage: $SCRIPT search <command>
-
-Available commands:
-
-    aae-status
-    switch-to-new-search
-"
-    esac
-}
-
 btype_admin()
 {
     case "$1" in

rel/files/riak-debug

@@ -108,7 +108,6 @@ Usage: riak-debug [-c] [-l] [-r] [-s] [-e] [-v] [FILENAME | -]
 -l, --logs      Gather Riak logs.
 -p, --patches   Gather the contents of the basho-patches directory.
 -r, --riakcmds  Gather Riak information and command output.
--y, --yzmcmds   Gather yokozuna information and logs.
 -s, --syscmds   Gather general system commands.
 -v, --verbose   Print verbose failure messages to stdout
 -e, --extracmds Gather extra command output. These commands are too intense to
@@ -248,7 +247,7 @@ if [ 0 -eq $(( $get_cfgs + $get_logs + $get_patches + $get_riakcmds + $get_yzcmd
     get_logs=1
     get_patches=1
     get_riakcmds=1
-    get_yzcmds=1
+    get_yzcmds=0
     get_syscmds=1
     get_extracmds=0
 fi

rel/vars.config

@@ -56,8 +56,5 @@
 {cuttlefish,         "on"}.
 {cuttlefish_conf,    "riak.conf"}.
 
-%%
-%% yokozuna
-%%
-{yz_solr_port, 8093}.
-{yz_solr_jmx_port, 8985}.
+%% {yz_solr_port, 8093}.
+%% {yz_solr_jmx_port, 8985}.