From 4a68a9c76f4c5a9d306f3473cbde73e69669da71 Mon Sep 17 00:00:00 2001 From: Jeff Silberman Date: Fri, 9 Sep 2016 11:09:22 -0700 Subject: [PATCH 01/12] add portworx to rancher catalog --- templates/portworx/0/README.md | 2 + templates/portworx/0/docker-compose.yml | 22 +++++++ templates/portworx/0/rancher-compose.yml | 13 +++++ templates/portworx/catalogIcon-portworx.svg | 64 +++++++++++++++++++++ templates/portworx/config.yml | 5 ++ 5 files changed, 106 insertions(+) create mode 100644 templates/portworx/0/README.md create mode 100644 templates/portworx/0/docker-compose.yml create mode 100644 templates/portworx/0/rancher-compose.yml create mode 100644 templates/portworx/catalogIcon-portworx.svg create mode 100644 templates/portworx/config.yml diff --git a/templates/portworx/0/README.md b/templates/portworx/0/README.md new file mode 100644 index 0000000..917f7fd --- /dev/null +++ b/templates/portworx/0/README.md @@ -0,0 +1,2 @@ +# [1.0.2-GA Documentation](http://docs.portworx.com) + diff --git a/templates/portworx/0/docker-compose.yml b/templates/portworx/0/docker-compose.yml new file mode 100644 index 0000000..43ce7e1 --- /dev/null +++ b/templates/portworx/0/docker-compose.yml @@ -0,0 +1,22 @@ +portworx: + labels: + io.rancher.container.create_agent: 'true' + io.rancher.scheduler.global: 'true' + io.rancher.container.pull_image: 'always' + image: portworx/px-enterprise + container_name: px + ipc: host + net: host + privileged: true + environment: + CLUSTER_TOKEN: ${cluster_token} + volumes: + - /dev:/dev + - /usr/src:/usr/src + - /run/docker/plugins:/run/docker/plugins + - /var/lib/osd:/var/lib/osd:shared + - /etc/pwx:/etc/pwx + - /opt/pwx/bin:/export_bin:shared + - /var/run/docker.sock:/var/run/docker.sock + - /var/cores:/var/cores + command: -t ${cluster_token} -a -f diff --git a/templates/portworx/0/rancher-compose.yml b/templates/portworx/0/rancher-compose.yml new file mode 100644 index 0000000..6388df7 --- /dev/null +++ b/templates/portworx/0/rancher-compose.yml @@ -0,0 +1,13 @@ +.catalog: + name: "Portworx" + version: "1.0.2-2016-09-07-GA" + description: "Container Defined Storage for Docker" + uuid: 352669-pwx-1.0.2 + minimum_rancher_version: v0.56.0 + questions: + - variable: cluster_token + description: "Cluster Token from Lighthouse" + label: "Cluster Token" + type: "string" + required: true + default: "" diff --git a/templates/portworx/catalogIcon-portworx.svg b/templates/portworx/catalogIcon-portworx.svg new file mode 100644 index 0000000..327db0b --- /dev/null +++ b/templates/portworx/catalogIcon-portworx.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/portworx/config.yml b/templates/portworx/config.yml new file mode 100644 index 0000000..6507029 --- /dev/null +++ b/templates/portworx/config.yml @@ -0,0 +1,5 @@ +name: px-enterprise +description: | + Software defined enterprise storage for Linux Containers. +version: 1.0.2-2016-09-07-GA +category: Storage From 5c00bb3fecd482588a1f0c47c54cc1e2440d5eb7 Mon Sep 17 00:00:00 2001 From: Jeff Silberman Date: Fri, 9 Sep 2016 11:09:28 -0700 Subject: [PATCH 02/12] Update docker-compose.yml --- templates/portworx/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/portworx/0/docker-compose.yml b/templates/portworx/0/docker-compose.yml index 43ce7e1..172d227 100644 --- a/templates/portworx/0/docker-compose.yml +++ b/templates/portworx/0/docker-compose.yml @@ -3,7 +3,7 @@ portworx: io.rancher.container.create_agent: 'true' io.rancher.scheduler.global: 'true' io.rancher.container.pull_image: 'always' - image: portworx/px-enterprise + image: portworx/px-dev container_name: px ipc: host net: host From acde7b7d66f8428eaa0bad3bdf57e04e57b13acb Mon Sep 17 00:00:00 2001 From: Jeff Silberman Date: Fri, 9 Sep 2016 11:10:26 -0700 Subject: [PATCH 03/12] Update config.yml --- templates/portworx/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/portworx/config.yml b/templates/portworx/config.yml index 6507029..e47bae9 100644 --- a/templates/portworx/config.yml +++ b/templates/portworx/config.yml @@ -1,4 +1,4 @@ -name: px-enterprise +name: px-dev description: | Software defined enterprise storage for Linux Containers. version: 1.0.2-2016-09-07-GA From fd1b956302323e6cc216907f0fc54dd6910367cb Mon Sep 17 00:00:00 2001 From: Jeff Silberman Date: Fri, 9 Sep 2016 11:43:45 -0700 Subject: [PATCH 04/12] Update README.md --- templates/portworx/0/README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/portworx/0/README.md b/templates/portworx/0/README.md index 917f7fd..6559d97 100644 --- a/templates/portworx/0/README.md +++ b/templates/portworx/0/README.md @@ -1,2 +1,6 @@ -# [1.0.2-GA Documentation](http://docs.portworx.com) +## Cluster Token Needed +Please contact support@portworx.com for a Cluster Token + +## Product Documentation +[Portworx Documentation] (https://docs.portworx.com) From bd1376018726b8bb3ce00623ea1b8b92b93c5e28 Mon Sep 17 00:00:00 2001 From: Jeff Silberman Date: Wed, 21 Sep 2016 16:38:52 -0700 Subject: [PATCH 05/12] remove https from doc url --- templates/portworx/0/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/portworx/0/README.md b/templates/portworx/0/README.md index 6559d97..7e22834 100644 --- a/templates/portworx/0/README.md +++ b/templates/portworx/0/README.md @@ -2,5 +2,5 @@ Please contact support@portworx.com for a Cluster Token ## Product Documentation -[Portworx Documentation] (https://docs.portworx.com) +[Portworx Documentation] (http://docs.portworx.com) From 2b0ae446f4614dadcaadbed8740ecc92c35f5a81 Mon Sep 17 00:00:00 2001 From: Jeff Silberman Date: Wed, 5 Oct 2016 14:34:25 +0200 Subject: [PATCH 06/12] 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: "" From 2977ffc8fe8bb1549fd62c4cb6efdb73dda53a18 Mon Sep 17 00:00:00 2001 From: Jeff Silberman Date: Wed, 5 Oct 2016 15:47:33 +0200 Subject: [PATCH 07/12] Update rancher-compose.yml Fix description --- templates/portworx/0/rancher-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/portworx/0/rancher-compose.yml b/templates/portworx/0/rancher-compose.yml index 45498d8..422a1b4 100644 --- a/templates/portworx/0/rancher-compose.yml +++ b/templates/portworx/0/rancher-compose.yml @@ -12,7 +12,7 @@ required: true default: "" - variable: kvdb - description: "Key-value database, accessibe to all nodes in PX cluster. (Ex: "etcd://10.0.0.42:4001") + 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 From 75bf2bf93652590b57920d0e9ce86d734f21e487 Mon Sep 17 00:00:00 2001 From: Jeff Silberman Date: Wed, 5 Oct 2016 16:04:05 +0200 Subject: [PATCH 08/12] Update rancher-compose.yml --- templates/portworx/0/rancher-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/portworx/0/rancher-compose.yml b/templates/portworx/0/rancher-compose.yml index 422a1b4..9e01511 100644 --- a/templates/portworx/0/rancher-compose.yml +++ b/templates/portworx/0/rancher-compose.yml @@ -12,7 +12,7 @@ required: true default: "" - variable: kvdb - description: "Key-value database, accessibe to all nodes in PX cluster (ex: etcd://10.0.0.42:4001)" + 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 From e12b22709d448c445f3476f913ff60d66f83ae94 Mon Sep 17 00:00:00 2001 From: Jeff Silberman Date: Wed, 5 Oct 2016 16:10:11 +0200 Subject: [PATCH 09/12] bump version to 1.0.6 --- templates/portworx/0/README.md | 2 +- templates/portworx/0/rancher-compose.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/portworx/0/README.md b/templates/portworx/0/README.md index 939e6f1..e992711 100644 --- a/templates/portworx/0/README.md +++ b/templates/portworx/0/README.md @@ -1,4 +1,4 @@ -# [1.0.2-GA Documentation](http://docs.portworx.com) +# [1.0.6-GA Documentation](http://docs.portworx.com) This catalog will spin up "px-dev". There are 2 configuration variables required: diff --git a/templates/portworx/0/rancher-compose.yml b/templates/portworx/0/rancher-compose.yml index 9e01511..8916d21 100644 --- a/templates/portworx/0/rancher-compose.yml +++ b/templates/portworx/0/rancher-compose.yml @@ -1,8 +1,8 @@ .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_id From 09d359ccddbfb40bfb30510bd1af11584d722326 Mon Sep 17 00:00:00 2001 From: Jeff Silberman Date: Wed, 5 Oct 2016 16:20:12 +0200 Subject: [PATCH 10/12] fix config.yml version --- templates/portworx/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/portworx/config.yml b/templates/portworx/config.yml index e47bae9..bddd4e3 100644 --- a/templates/portworx/config.yml +++ b/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 From ce1b5ae49137cb9bb2e848db09cb32c97acdaa98 Mon Sep 17 00:00:00 2001 From: Gou Rao Date: Sat, 8 Oct 2016 10:43:33 -0700 Subject: [PATCH 11/12] Update README.md --- templates/portworx/0/README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/portworx/0/README.md b/templates/portworx/0/README.md index e992711..49e2230 100644 --- a/templates/portworx/0/README.md +++ b/templates/portworx/0/README.md @@ -1,9 +1,11 @@ # [1.0.6-GA Documentation](http://docs.portworx.com) -This catalog will spin up "px-dev". +This catalog will spin up Portworx on your hosts. 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) + 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 + From 5b56107f9cf9528d581c5b01adafdd83f1b78498 Mon Sep 17 00:00:00 2001 From: Gou Rao Date: Sat, 8 Oct 2016 10:44:27 -0700 Subject: [PATCH 12/12] Update docker-compose.yml --- templates/portworx/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/portworx/0/docker-compose.yml b/templates/portworx/0/docker-compose.yml index 1280d3a..09a891a 100644 --- a/templates/portworx/0/docker-compose.yml +++ b/templates/portworx/0/docker-compose.yml @@ -20,4 +20,4 @@ portworx: - /opt/pwx/bin:/export_bin:shared - /var/run/docker.sock:/var/run/docker.sock - /var/cores:/var/cores - command: -c ${cluster_id} -k ${kvdb} -a -f + command: -c ${cluster_id} -k ${kvdb} -a -z -f