Improved install script and updated the install

readme file.

Change-Id: I5d038d06b3113caaa7b4df054321c6f997331177

INSTALL.rst

@@ -5,7 +5,7 @@ Tap as a Service installation guide
 This is the installation guide for enabling Tap-as-a-Service(TaaS) feature in
 OpenStack Neutron
 
-We have tested TaaS with DevStack version <TODO> running on Ubuntu 12.04 and
+We have tested TaaS with latest version DevStack running on Ubuntu 12.04 and
 14.04. TaaS is currently under active development and we will update you of
 new features and capabilities as and when they become available. Feel free to
 approach us with any issues related to installing or using TaaS.
@@ -20,7 +20,9 @@ Adding the folowing section to 'local.conf' while installing devstack will enabl
 'Port Security' extension
 
 	[[post-config|/$Q_PLUGIN_CONF_FILE]]
+
 	[ml2]
+
 	extension_drivers=port_security
 
 
@@ -35,9 +37,24 @@ Installation
    README.rst and INSTALL.rst files) A complete installation of TaaS requires installation
    of TaaS Plugin, TaaS Agent, and TaaS cli.
 
-4. To install the TaaS plugin and agent invoke the following command
-   	./install.sh install <directory where devstack neutron is installed> <mysql password>
-	Example: ./install.sh install /opt/stack/neutron/ stackdb
+4. To install the TaaS plugin invoke the following command
+
+   	./install.sh install_plugin <directory where devstack neutron is installed> <mysql password>
+
+	Example: ./install.sh install_plugin /opt/stack/neutron/ stackdb
+
+   Install the TaaS plugin on the node where Neutron Service is running (usually the controller node)
+
+5. To install the TaaS agent invoke the following command
+
+   	./install.sh install_agent <directory where devstack neutron is installed>
+
+	Example: ./install.sh install_agent /opt/stack/neutron/ stackdb
+
+   Install the TaaS agent on all the compute nodes.
+
+   **Important**: Note that if controller and compute are running on the same node, only run install_plugin
+   and it will install both the TaaS plugin and agent 
 
 Running TaaS
 ============

install.sh

@@ -7,22 +7,22 @@ DEVSTACK_PATH=$2
 MYSQL_PASS=$3
 
 if [ -z $COMMAND ] || [ -z $DEVSTACK_PATH ]; then
-    echo "Usage: $0 <install|run_agent> <devstack install path> [mysql password]"
+    echo "Usage: $0 <install_plugin|install_agent|run_agent> <devstack install path> [mysql password]"
     exit 1
 fi
 
-if [ "$COMMAND" != "install" ] && [ "$COMMAND" != "run_agent" ]; then
-    echo "Usage: $0 <install|run_agent> <devstack install path> [mysql password]"
+if [ "$COMMAND" != "install_plugin" ] && [ "$COMMAND" != "install_agent" ] && [ "$COMMAND" != "run_agent" ]; then
+    echo "Usage: $0 <install_plugin|install_agent|run_agent> <devstack install path> [mysql password]"
     exit 1
 fi
 
 # Switch on the command
 
-if [ "$COMMAND" = "install" ]; then
-    # Check if mysql password has been provided
-    if [ -z $MYSQL_PASS  ]; then
-        echo "Please provide the mysql password with the install command\n"
-        echo "Usage: $0 <install|run_agent> <devstack install path> [mysql password]"
+if [ "$COMMAND" = "install_plugin" ] || [ "$COMMAND" = "install_agent" ]; then
+    # Check if mysql password has been provided if the case is install_plugin
+    if [ "$COMMAND" = "install_plugin" ] && [ -z $MYSQL_PASS  ]; then
+        echo "Please provide the mysql password with the install_plugin command\n"
+        echo "Usage: $0 <install_plugin|install_agent|run_agent> <devstack install path> [mysql password]"
         exit 1
     fi
 
@@ -69,7 +69,8 @@ if [ "$COMMAND" = "install" ]; then
         exit 1
     fi
 
-    #invoke the database creator file
+    #invoke the database creator script
+    if [ "$COMMAND" = "install_plugin" ]; then
         /usr/bin/python ./neutron_taas/neutron_dependencies/neutron_taas_db_init.py $MYSQL_PASS
         if [ $? = 0 ]; then
             echo "Created the DB schema required for TaaS...."
@@ -77,6 +78,7 @@ if [ "$COMMAND" = "install" ]; then
             echo "Install failed while creating DB schema for TaaS"
             exit 1
         fi
+    fi
 
     # Install the taas_cli
     sudo ln -s $DEVSTACK_PATH/neutron_taas/taas_cli/taas_cli.py /usr/local/bin/taas