Merge pull request #303 from portworx/master

Bump version for px-dev to 1.0.6

templates/portworx/0/README.md

@@ -1,6 +1,11 @@
-## Cluster Token Needed
+# [1.0.6-GA Documentation](http://docs.portworx.com)
-Please contact support@portworx.com for a Cluster Token
 
-## Product Documentation 
+This catalog will spin up Portworx on your hosts.
-[Portworx Documentation] (http://docs.portworx.com)
+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**:  A 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)
+
+For the Portworx Enterprise edition which has support for a larger number of nodes, enterprise features such as cloud native encryption, monitoring and web UI, contact support@portworx.com
 

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 -z -f

templates/portworx/0/rancher-compose.yml

@@ -1,13 +1,19 @@
 .catalog:
   name: "Portworx"
-  version: "1.0.2-2016-09-07-GA"
+  version: "1.0.6-2016-10-05-GA"
   description: "Container Defined Storage for Docker"
-  uuid: 352669-pwx-1.0.2
+  uuid: 352669-pwx-1.0.6
   minimum_rancher_version: v0.56.0
   questions:
-    - variable: cluster_token
+    - variable: cluster_id
-      description: "Cluster Token from Lighthouse"
+      description: "Arbitrary Cluster ID, common to all nodes in PX cluster "
-      label: "Cluster Token"
+      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: ""

templates/portworx/config.yml

@@ -1,5 +1,5 @@
 name: px-dev
 description: |
   Software defined enterprise storage for Linux Containers.
-version: 1.0.2-2016-09-07-GA
+version: 1.0.6-2016-10-05-GA
 category: Storage