From f02a2cf1e9371afd729dcabae40a0baca9de2cb4 Mon Sep 17 00:00:00 2001
From: LLParse <joliver@rancher.com>
Date: Thu, 24 Mar 2016 09:37:35 -0700
Subject: [PATCH] Add Rancher metadata to swarm templates

---
 swarm-templates/cassandra/0/docker-compose.yml |  6 ------
 .../cassandra/0/rancher-compose.yml            |  5 +++++
 swarm-templates/cassandra/config.yml           |  4 ++--
 swarm-templates/ghost/0/docker-compose.yml     |  4 ++--
 swarm-templates/ghost/0/rancher-compose.yml    | 12 ++++++++++++
 swarm-templates/ghost/config.yml               |  2 +-
 swarm-templates/wordpress/0/docker-compose.yml |  5 ++---
 .../wordpress/0/rancher-compose.yml            | 18 ++++++++++++++++++
 swarm-templates/wordpress/config.yml           |  2 +-
 9 files changed, 43 insertions(+), 15 deletions(-)
 create mode 100644 swarm-templates/cassandra/0/rancher-compose.yml
 create mode 100644 swarm-templates/ghost/0/rancher-compose.yml
 create mode 100644 swarm-templates/wordpress/0/rancher-compose.yml

diff --git a/swarm-templates/cassandra/0/docker-compose.yml b/swarm-templates/cassandra/0/docker-compose.yml
index 21913d2..6b9a1cb 100644
--- a/swarm-templates/cassandra/0/docker-compose.yml
+++ b/swarm-templates/cassandra/0/docker-compose.yml
@@ -1,8 +1,2 @@
-cassandra-seed:
-  image: cassandra:3.3
 cassandra:
   image: cassandra:3.3
-  links:
-    - cassandra-seed:seed
-  environment:
-    - CASSANDRA_SEEDS=seed
diff --git a/swarm-templates/cassandra/0/rancher-compose.yml b/swarm-templates/cassandra/0/rancher-compose.yml
new file mode 100644
index 0000000..9f296e2
--- /dev/null
+++ b/swarm-templates/cassandra/0/rancher-compose.yml
@@ -0,0 +1,5 @@
+.catalog:
+  name: "Cassandra"
+  version: 3.3-rancher1
+  description: "Deploy a Cassandra node"
+  minimum_rancher_version: v1.0.0-rc2
diff --git a/swarm-templates/cassandra/config.yml b/swarm-templates/cassandra/config.yml
index 171f95a..505adae 100644
--- a/swarm-templates/cassandra/config.yml
+++ b/swarm-templates/cassandra/config.yml
@@ -1,4 +1,4 @@
-name: "Swarm Cassandra"
+name: "Cassandra"
 description: "Distributed Database"
-version: 1.0.0
+version: 3.3-rancher1
 category: Databases
diff --git a/swarm-templates/ghost/0/docker-compose.yml b/swarm-templates/ghost/0/docker-compose.yml
index 62a7744..62242e7 100644
--- a/swarm-templates/ghost/0/docker-compose.yml
+++ b/swarm-templates/ghost/0/docker-compose.yml
@@ -1,4 +1,4 @@
 ghost:
-  image: ghost
+  image: ghost:0.7.8
   ports:
-    - "80:2368"
+    - "${client_port}:2368"
diff --git a/swarm-templates/ghost/0/rancher-compose.yml b/swarm-templates/ghost/0/rancher-compose.yml
new file mode 100644
index 0000000..3549487
--- /dev/null
+++ b/swarm-templates/ghost/0/rancher-compose.yml
@@ -0,0 +1,12 @@
+.catalog:
+  name: "Ghost"
+  version: 0.7.8-rancher1
+  description: "Blog powered by Ghost"
+  minimum_rancher_version: v1.0.0-rc2
+  questions:
+    - variable: client_port
+      description: "Port to access the blog"
+      label: "Client Port"
+      required: true
+      default: "80"
+      type: "int"
diff --git a/swarm-templates/ghost/config.yml b/swarm-templates/ghost/config.yml
index 7458168..fe041a6 100644
--- a/swarm-templates/ghost/config.yml
+++ b/swarm-templates/ghost/config.yml
@@ -1,5 +1,5 @@
 name: Ghost
 description: |
   Blog powered by Ghost
-version: v0.1-educaas
+version: 0.7.8-rancher1
 category: Blogging
diff --git a/swarm-templates/wordpress/0/docker-compose.yml b/swarm-templates/wordpress/0/docker-compose.yml
index cfa4ec0..f3f7f91 100644
--- a/swarm-templates/wordpress/0/docker-compose.yml
+++ b/swarm-templates/wordpress/0/docker-compose.yml
@@ -3,9 +3,8 @@ wordpress:
   links:
     - db:mysql
   ports:
-    - 80:80
-
+    - ${client_port}:80
 db:
   image: mariadb
   environment:
-    MYSQL_ROOT_PASSWORD: example
+    MYSQL_ROOT_PASSWORD: ${db_password}
diff --git a/swarm-templates/wordpress/0/rancher-compose.yml b/swarm-templates/wordpress/0/rancher-compose.yml
new file mode 100644
index 0000000..3ed1fba
--- /dev/null
+++ b/swarm-templates/wordpress/0/rancher-compose.yml
@@ -0,0 +1,18 @@
+.catalog:
+  name: "Wordpress"
+  version: latest-rancher1
+  description: "Blog tool, publishing platform and CMS"
+  minimum_rancher_version: v1.0.0-rc2
+  questions:
+    - variable: client_port
+      description: "Port to access Wordpress"
+      label: "Client Port"
+      required: true
+      default: "80"
+      type: "int"
+    - variable: db_password
+      description: "Password for database"
+      label: "Password (default: wordpress)"
+      required: true
+      default: "wordpress"
+      type: "password"
diff --git a/swarm-templates/wordpress/config.yml b/swarm-templates/wordpress/config.yml
index d92812a..b601df3 100644
--- a/swarm-templates/wordpress/config.yml
+++ b/swarm-templates/wordpress/config.yml
@@ -1,5 +1,5 @@
 name: Wordpress
 description: |
   Blog tool, publishing platform and CMS
-version: v0.1-educaas1
+version: latest-rancher1
 category: Blog