From 3aa0c2e80313f53012a8a1414df00ec883c488d1 Mon Sep 17 00:00:00 2001
From: Soam Vasani <soamvasani@platform9.com>
Date: Wed, 30 Nov 2016 13:48:42 -0800
Subject: [PATCH] Streamline setup instructions a bit

---
 README.md | 61 ++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 619c93c0..58dde620 100644
--- a/README.md
+++ b/README.md
@@ -88,41 +88,26 @@ Or, you can use Google Container Engine's free trial to get a 3 node cluster.
   $ kubectl version
 ```
 
-### Get and Run Fission
+### Get and Run Fission: Minikube or Local cluster
 
-Deploy the fission services and deployments.
+If you're using minikube or no cloud provider, use these commands to
+set up services with NodePort.  This exposes fission on ports 31313
+and 31314.
 
 ```
   $ kubectl create -f http://fission.io/fission.yaml
-```
-
-#### local and no cloud provider
-
-If you're using minikube or no cloud provider use the services with NodePort.
-
-```
   $ kubectl create -f http://fission.io/fission-nodeport.yaml
 ```
 
-#### Cloud
-
-If you're using GKE or any other cloud provider, use the services with a LoadBalancer.
-
-```
-  $ kubectl create -f http://fission.io/fission-cloud.yaml
-```
-
-### Set fission URLs
-
 ```
   $ kubectl --namespace fission get services
 ```
 
 Save the external IP addresses of controller and router services in
-FISSION_URL and FISSION_ROUTER, respectively. FISSION_URL should be prefixed with a `http://`.  FISSION_URL is used by
-the fission CLI to find the server.  (FISSION_ROUTER is only needed
-for the examples below to work.) Below is an example
-for Minikube with NodePort.
+FISSION_URL and FISSION_ROUTER, respectively. FISSION_URL should be
+prefixed with a `http://`.  FISSION_URL is used by the fission CLI to
+find the server.  (FISSION_ROUTER is only needed for the examples
+below to work.) Below is an example for Minikube with NodePort.
 
 ```
   $ export FISSION_ROUTER=$(minikube ip):31314
@@ -130,6 +115,36 @@ for Minikube with NodePort.
   $ export FISSION_URL=http://$(minikube ip):31313
 ```
 
+
+### Get and Run Fission: GKE or other Cloud
+
+If you're using GKE or any other cloud provider that supports the
+LoadBalancer service type, use these commands:
+
+```
+  $ kubectl create -f http://fission.io/fission.yaml
+  $ kubectl create -f http://fission.io/fission-cloud.yaml
+```
+
+Wait for services to get IP addresses (check this with ```kubectl
+--namespace fission get svc```).  Then:
+
+```
+  $ export FISSION_URL=http://$(kubectl --namespace fission get svc controller -o=jsonpath='{..ip}')
+  $ export FISSION_ROUTER=$(kubectl --namespace fission get svc router -o=jsonpath='{..ip}')
+```
+
+
+### Set fission URLs
+
+
+Save the external IP addresses of controller and router services in
+FISSION_URL and FISSION_ROUTER, respectively. FISSION_URL should be
+prefixed with a `http://`.  FISSION_URL is used by the fission CLI to
+find the server.  (FISSION_ROUTER is only needed for the examples
+below to work.) Below is an example for Minikube with NodePort.
+
+
 ### Install the client CLI
 
 ```