Merge pull request #44 from sachja/master

mount gopath and update script to use that

Author: sachja

docs/Dockerhost.md

@@ -6,8 +6,11 @@ The outside docker containers act like physical hosts in our test and are connec
 Prerequisites
 -------------
 The following needs to be installed on the host machine
+
 1. Docker
+
 2. nsenter  (Pls see https://github.com/jpetazzo/nsenter)
+
 3. Bridge utils
 ```
 	apt-get install bridge-utils
@@ -20,7 +23,7 @@ Step to launch docker hosts are :
 	CONTINV_NODES=2 make start-dockerdemo
 ```
 
-This will start CONTIV_NODES number of containers with docker image called ubuntu_netplugin which is just ubuntu image with docker, etcd and ovs installed. 
+This will start CONTIV_NODES number of containers with docker image called ubuntu_netplugin which is just ubuntu image with docker, etcd and ovs installed. The $GOPATH directory is mounted in the docker host at /gopath directory.
 
 Now start a shell within any of the "host containers" using following convenience wrapper around nsenter : 
 ```
@@ -47,7 +50,7 @@ Example for testing TwoHostMultiVlan you can do :
 2. Load the netplugin configuration
   ```
   docker-sh netplugin-node1
-  /netplugin/bin/netdcli -cfg /netplugin/examples/two_hosts_multiple_vlans_nets.json
+  /gopath/bin/netdcli -cfg /gopath/src/githib.com/contiv/netplugin/examples/two_hosts_multiple_vlans_nets.json
   ```
   
 3. Launch container1 on host1

scripts/dockerhost/start-dockerhosts

@@ -14,8 +14,6 @@ then
 fi
 echo "Num nodes = "$num_nodes
 
-netplugin_path=$(pwd)
-
 # Create the docker image for hosts
 sudo docker build -t ubuntu_netplugin $scriptdir
 
@@ -25,7 +23,7 @@ for i in `seq 1 $num_nodes`;
 do
     hostname="netplugin-node$i"
     echo "Starting $hostname"
-    sudo docker run -d -i -t --name $hostname --privileged -v /var/lib/docker -v $netplugin_path:/netplugin ubuntu_netplugin bash -c "/netplugin/scripts/dockerhost/start-service.sh & bash"
+    sudo docker run -d -i -t --name $hostname --privileged -v /var/lib/docker -v $GOPATH:/gopath ubuntu_netplugin bash -c "/gopath/src/github.com/contiv/netplugin/scripts/dockerhost/start-service.sh & bash"
     sudo nsenter -t $($scriptdir/docker-pid $hostname) -n hostname $hostname
     sudo ip link add $i-int type veth peer name $i-ext
     sudo brctl addif br-em1 $i-ext
@@ -60,6 +58,6 @@ for i in `seq 1 $num_nodes`;
 do
     hostname="netplugin-node$i"
     echo "Starting netplugin on $hostname"
-    sudo docker exec $hostname /netplugin/bin/netplugin -host-label host$i &
+    sudo docker exec $hostname /gopath/bin/netplugin -host-label host$i &
 done