From 2b0ae446f4614dadcaadbed8740ecc92c35f5a81 Mon Sep 17 00:00:00 2001
From: Jeff Silberman <jsilberm@gmail.com>
Date: Wed, 5 Oct 2016 14:34:25 +0200
Subject: [PATCH] updated for px-dev with -c option

---
 templates/portworx/0/README.md           | 11 +++++++----
 templates/portworx/0/docker-compose.yml  |  5 +++--
 templates/portworx/0/rancher-compose.yml | 12 +++++++++---
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/templates/portworx/0/README.md b/templates/portworx/0/README.md
index 7e22834..939e6f1 100644
--- a/templates/portworx/0/README.md
+++ b/templates/portworx/0/README.md
@@ -1,6 +1,9 @@
-## Cluster Token Needed
-Please contact support@portworx.com for a Cluster Token
+# [1.0.2-GA Documentation](http://docs.portworx.com)
 
-## Product Documentation 
-[Portworx Documentation] (http://docs.portworx.com)
+This catalog will spin up "px-dev".
+There are 2 configuration variables required:
+ 1. **cluster_id**:  Arbitrary Cluster ID, common to all nodes in PX cluster.  (Can use https://www.uuidgenerator.net for example)
+ 2. **kvdb**:  Key-value database that is accessible to all nodes in the PX cluster.  (Ex: etcd://10.0.0.42:4001)
+
+For detailed documentation, please visit [docs.portworx.com](http://docs.portworx.com)
 
diff --git a/templates/portworx/0/docker-compose.yml b/templates/portworx/0/docker-compose.yml
index 172d227..1280d3a 100644
--- a/templates/portworx/0/docker-compose.yml
+++ b/templates/portworx/0/docker-compose.yml
@@ -9,7 +9,8 @@ portworx:
   net: host
   privileged: true
   environment:
-    CLUSTER_TOKEN: ${cluster_token}
+    CLUSTER_ID: ${cluster_id}
+    KVDB: ${kvdb}
   volumes:
      - /dev:/dev
      - /usr/src:/usr/src
@@ -19,4 +20,4 @@ portworx:
      - /opt/pwx/bin:/export_bin:shared
      - /var/run/docker.sock:/var/run/docker.sock
      - /var/cores:/var/cores
-  command: -t ${cluster_token} -a -f
+  command: -c ${cluster_id} -k ${kvdb} -a -f
diff --git a/templates/portworx/0/rancher-compose.yml b/templates/portworx/0/rancher-compose.yml
index 6388df7..45498d8 100644
--- a/templates/portworx/0/rancher-compose.yml
+++ b/templates/portworx/0/rancher-compose.yml
@@ -5,9 +5,15 @@
   uuid: 352669-pwx-1.0.2
   minimum_rancher_version: v0.56.0
   questions:
-    - variable: cluster_token
-      description: "Cluster Token from Lighthouse"
-      label: "Cluster Token"
+    - variable: cluster_id
+      description: "Arbitrary Cluster ID, common to all nodes in PX cluster "
+      label: "Cluster ID"
+      type: "string"
+      required: true
+      default: ""
+    - variable: kvdb
+      description: "Key-value database, accessibe to all nodes in PX cluster. (Ex: "etcd://10.0.0.42:4001")
+      label: "Key-Value Database"
       type: "string"
       required: true
       default: ""