Remove straggling zookeper references

Issue-ID: MUSIC-361
Signed-off-by: Tschaen, Brendan <ctschaen@att.com>
Change-Id: I4faac78bc898b07902ce97ac6112f0dcd4a3729a

4 files changed, 3 insertions, 70 deletions

diff --git a/docs/multi.rst b/docs/multi.rst
index bc26465f..380f4ea5 100644
--- a/docs/multi.rst
+++ b/docs/multi.rst
@@ -72,63 +72,6 @@ To access keyspace through cqlsh, login with credentials that are passed to MUSI
 
 
 
-Zookeeper:
-----------
-Once zookeeper has been installed on all the nodes, modify the  **zk_install_location/conf/zoo.cfg** on all the nodes with the following lines:
-
-::
-
-    tickTime=2000
-    dataDir=/opt/app/music/var/zookeeper
-    clientPort=2181
-    initLimit=5
-    syncLimit=2
-    quorumListenOnAllIPs=true
-    server.1=public IP of node 1:2888:3888
-    server.2=public IP of node 2:2888:3888
-    server.3=public IP of node 3:2888:3888
-
-Create the directory /var/zookeeper in all the machines and within that create a file called myid that contains the id of the machine. The machine running node.i will contain just the number i in the file myid.
-
-Start each of the nodes one by one from the zk_install_location/bin folder using the command:
-
-
-
- ./zkServer.sh start
-
-On each node check the file zookeeper.out in the  zk_install_location/ bin to make sure all the machines are talking to each other and there are no errors. Note that while the machines are yet to come up there maybe error messages saying that connection has not yet been established. Clearly, this is ok.
-
-
-If there are no errors, then from zk_install_location/bin simply run the following to get command line access to zookeeper.   ./zkCli.sh
-
-
-Run these commands on different machines to make sure the zk nodes are syncing.
-
-::
-
-    [zkshell] ls /
-    [zookeeper]
-
-Next, create a new znode by running
-
-::
-
-    create /zk_test my_data.
-
-This creates a new znode and associates the string "my_data" with the node. You should see:
-
-::
-
-    [zkshell] create /zk_test my_data
-    Created /zk_test
-
-Issue another ls / command to see what the directory looks like:
-
-::
-
-    [zkshell] ls /
-    [zookeeper, zk_test]
-
 MUSIC
 Create a music.properties file and place it in /opt/app/music/etc at each node. Here is a sample of the file: 
 cassandra.yaml::
diff --git a/docs/setup.rst b/docs/setup.rst
index b12acd04..7fb5bf49 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -17,27 +17,20 @@ The main MUSIC dir should be::
     # These also need to be set up
     /opt/app/music/etc
     /opt/app/music/logs
-    /opt/app/music/lib/zookeeper
 
-When installing Tomcat, Cassandra and Zookeeper they should also be installed here.::
+When installing, Cassandra should also be installed here.::
 
     /opt/app/music/apache-cassandra-n.n.n
-    /opt/app/music/zookeeper-n.n.n
-    /opt/app/music/apache-tomcat-n.n.n
 
 
 You could also create links from install dirs to a common name ie\:::
 
     ln -s /opt/app/music/apache-cassandra-n.n.n cassandra
-    ln -s /opt/app/music/zookeeper-n.n.n zookeeper
-    ln -s /opt/app/music/apache-tomcat-n.n.n tomcat
 
-Cassandra and Zookeeper have data dirs.::
+Cassandra has data dirs.::
     
     # For cassandra it should be (This is the default) 
     /opt/app/music/cassandra/data    
-    # For Zookeeper it should be 
-    /opt/app/music/zookeeper/
 
 
 Continue by selecting the link to the setup you are doing.
diff --git a/docs/single.rst b/docs/single.rst
index 060f02b4..632db5ac 100644
--- a/docs/single.rst
+++ b/docs/single.rst
@@ -15,8 +15,6 @@ Instructions
 - Ensure you have OpenJDK 8 on your machine.
 - Download Apache Cassandra 3.0, install into /opt/app/music and follow these instructions http://cassandra.apache.org/doc/latest/getting_started/installing.html till and including Step
 - By the end of this you should have Cassandra working.
-- Download Apache Zookeeper 3.4.6, install into /opt/app/music and follow these instructions https://zookeeper.apache.org/doc/r3.4.6/zookeeperStarted.html pertaining to the standalone operation. By the end of this you should have Zookeeper working.
-- Download the Version 8.5 Apache Tomcat and install it using these instructions https://tomcat.apache.org/download-80.cgi (this is for version 8.5).
 - Create a music.properties file and place it in /opt/app/music/etc/. Here is a sample of the file:
 
 music.properties::
@@ -30,7 +28,6 @@ music.properties::
     # Optional current values are defaults
     ######################################
     # If using docker this would point to the specific docker name.
-    #zookeeper.host=localhost
     #cassandra.host=localhost
     #music.ip=localhost
  
diff --git a/docs/swagger.json b/docs/swagger.json
index 534d2af4..3bc67050 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -964,7 +964,7 @@
           "Lock Api"
         ],
         "summary": "Create Lock",
-        "description": "Puts the requesting process in the q for this lock. The corresponding node will be created in zookeeper if it did not already exist. Lock Name is the \"key\" of the form keyspaceName.tableName.rowId",
+        "description": "Puts the requesting process in the q for this lock. The corresponding lock will be created if it did not already exist. Lock Name is the \"key\" of the form keyspaceName.tableName.rowId",
         "operationId": "createLockReference",
         "produces": [
           "application/json"