From 1da93ae0434ff1179eeb1c2acc6648216cf945be Mon Sep 17 00:00:00 2001
From: James Oliver <joliver@rancher.com>
Date: Mon, 23 May 2016 16:36:41 -0700
Subject: [PATCH 1/2] Remove zookeeper/mesos template parameters

---
 mesos-templates/aurora/0/docker-compose.yml         |  4 ++--
 mesos-templates/aurora/0/rancher-compose.yml        | 10 ----------
 mesos-templates/chronos/0/docker-compose.yml        |  4 ++--
 mesos-templates/chronos/0/rancher-compose.yml       | 11 -----------
 mesos-templates/elasticsearch/0/docker-compose.yml  |  4 ++--
 mesos-templates/elasticsearch/0/rancher-compose.yml | 10 ----------
 mesos-templates/kafka/0/docker-compose.yml          |  4 ++--
 mesos-templates/kafka/0/rancher-compose.yml         | 10 ----------
 mesos-templates/marathon/0/docker-compose.yml       |  4 ++--
 mesos-templates/marathon/0/rancher-compose.yml      | 11 -----------
 10 files changed, 10 insertions(+), 62 deletions(-)

diff --git a/mesos-templates/aurora/0/docker-compose.yml b/mesos-templates/aurora/0/docker-compose.yml
index fbf9bda..871719f 100644
--- a/mesos-templates/aurora/0/docker-compose.yml
+++ b/mesos-templates/aurora/0/docker-compose.yml
@@ -1,8 +1,8 @@
 scheduler:
   image: rancher/aurora:latest
   environment:
-    ZK_SERVICE: ${ZK_SERVICE}
-    MESOS_SERVICE: ${MESOS_SERVICE}
+    ZK_SERVICE: Mesos/zookeeper
+    MESOS_SERVICE: Mesos/mesos-master
     AURORA_HTTP_PORT: ${AURORA_HTTP_PORT}
   volumes:
   - "/var/run/docker.sock:/var/run/docker.sock"
diff --git a/mesos-templates/aurora/0/rancher-compose.yml b/mesos-templates/aurora/0/rancher-compose.yml
index fa0f400..010959e 100644
--- a/mesos-templates/aurora/0/rancher-compose.yml
+++ b/mesos-templates/aurora/0/rancher-compose.yml
@@ -4,16 +4,6 @@
   description: |
     Orchestrate long-running services and cron jobs
   questions:
-  - variable: ZK_SERVICE
-    description: Choose the Zookeeper service to use.
-    label: Zookeeper Service
-    required: true
-    type: service
-  - variable: MESOS_SERVICE
-    description: Choose the Mesos stack to use.
-    label: Mesos Stack
-    required: true
-    type: service
   - variable: AURORA_HTTP_PORT
     description: Port to expose Aurora scheduler on.
     label: Aurora Port
diff --git a/mesos-templates/chronos/0/docker-compose.yml b/mesos-templates/chronos/0/docker-compose.yml
index 7473e0c..13f7676 100644
--- a/mesos-templates/chronos/0/docker-compose.yml
+++ b/mesos-templates/chronos/0/docker-compose.yml
@@ -1,8 +1,8 @@
 chronos:
   image: rancher/chronos:latest
   environment:
-    MESOS_SERVICE: ${MESOS_SERVICE}
-    ZK_SERVICE: ${ZK_SERVICE}
+    ZK_SERVICE: Mesos/zookeeper
+    MESOS_SERVICE: Mesos/mesos-master
     CHRONOS_HTTP_PORT: ${CHRONOS_HTTP_PORT}
   ports:
   - "${CHRONOS_HTTP_PORT}:${CHRONOS_HTTP_PORT}"
\ No newline at end of file
diff --git a/mesos-templates/chronos/0/rancher-compose.yml b/mesos-templates/chronos/0/rancher-compose.yml
index 63cac08..cff11ea 100644
--- a/mesos-templates/chronos/0/rancher-compose.yml
+++ b/mesos-templates/chronos/0/rancher-compose.yml
@@ -4,17 +4,6 @@
   description: |
     Distributed, fault-tolerant cron
   questions:
-  - variable: ZK_SERVICE
-    description: Choose the Zookeeper service to use.
-    label: Zookeeper Service
-    required: true
-    type: service
-  # a stack type would be nice
-  - variable: MESOS_SERVICE
-    description: Choose the Mesos stack to use.
-    label: Mesos Stack
-    required: true
-    type: service
   - variable: CHRONOS_HTTP_PORT
     description: Port to expose Chronos on.
     label: Chronos Port
diff --git a/mesos-templates/elasticsearch/0/docker-compose.yml b/mesos-templates/elasticsearch/0/docker-compose.yml
index 7be3d56..5665222 100644
--- a/mesos-templates/elasticsearch/0/docker-compose.yml
+++ b/mesos-templates/elasticsearch/0/docker-compose.yml
@@ -1,8 +1,8 @@
 scheduler:
   image: rancher/elasticsearch:latest
   environment:
-    MESOS_SERVICE: ${MESOS_SERVICE}
-    ZK_SERVICE: ${ZK_SERVICE}
+    ZK_SERVICE: Mesos/zookeeper
+    MESOS_SERVICE: Mesos/mesos-master
     SCHEDULER_PORT: ${SCHEDULER_PORT}
     JAVA_OPTS: -Xms256M -Xmx256M
     NODE_COUNT: ${NODE_COUNT}
diff --git a/mesos-templates/elasticsearch/0/rancher-compose.yml b/mesos-templates/elasticsearch/0/rancher-compose.yml
index aab1b5a..8115020 100644
--- a/mesos-templates/elasticsearch/0/rancher-compose.yml
+++ b/mesos-templates/elasticsearch/0/rancher-compose.yml
@@ -4,16 +4,6 @@
   description: |
     You know, for search
   questions:
-  - variable: ZK_SERVICE
-    description: Choose the Zookeeper service to use.
-    label: Zookeeper Service
-    required: true
-    type: service
-  - variable: MESOS_SERVICE
-    description: Choose the Mesos stack to use.
-    label: Mesos Stack
-    required: true
-    type: service
   - variable: SCHEDULER_PORT
     description: Port to expose scheduler on.
     label: Scheduler Port
diff --git a/mesos-templates/kafka/0/docker-compose.yml b/mesos-templates/kafka/0/docker-compose.yml
index 315b342..94b0f33 100644
--- a/mesos-templates/kafka/0/docker-compose.yml
+++ b/mesos-templates/kafka/0/docker-compose.yml
@@ -1,8 +1,8 @@
 scheduler:
   image: rancher/kafka:latest
   environment:
-    MESOS_SERVICE: ${MESOS_SERVICE}
-    ZK_SERVICE: ${ZK_SERVICE}
+    ZK_SERVICE: Mesos/zookeeper
+    MESOS_SERVICE: Mesos/mesos-master
     SCHEDULER_PORT: ${SCHEDULER_PORT}
   ports:
   - "${SCHEDULER_PORT}:${SCHEDULER_PORT}"
diff --git a/mesos-templates/kafka/0/rancher-compose.yml b/mesos-templates/kafka/0/rancher-compose.yml
index b4243d1..ab25f20 100644
--- a/mesos-templates/kafka/0/rancher-compose.yml
+++ b/mesos-templates/kafka/0/rancher-compose.yml
@@ -4,16 +4,6 @@
   description: |
     A high-throughput distributed messaging system
   questions:
-  - variable: ZK_SERVICE
-    description: Choose the Zookeeper service to use.
-    label: Zookeeper Service
-    required: true
-    type: service
-  - variable: MESOS_SERVICE
-    description: Choose the Mesos stack to use.
-    label: Mesos Stack
-    required: true
-    type: service
   - variable: SCHEDULER_PORT
     description: Port to expose Kafka Scheduler on.
     label: Scheduler Port
diff --git a/mesos-templates/marathon/0/docker-compose.yml b/mesos-templates/marathon/0/docker-compose.yml
index a665a59..1286814 100644
--- a/mesos-templates/marathon/0/docker-compose.yml
+++ b/mesos-templates/marathon/0/docker-compose.yml
@@ -1,8 +1,8 @@
 marathon:
   image: rancher/marathon:latest
   environment:
-    MESOS_SERVICE: ${MESOS_SERVICE}
-    ZK_SERVICE: ${ZK_SERVICE}
+    ZK_SERVICE: Mesos/zookeeper
+    MESOS_SERVICE: Mesos/mesos-master
     MARATHON_HTTP_PORT: ${MARATHON_HTTP_PORT}
   ports:
   - "${MARATHON_HTTP_PORT}:${MARATHON_HTTP_PORT}"
diff --git a/mesos-templates/marathon/0/rancher-compose.yml b/mesos-templates/marathon/0/rancher-compose.yml
index c27b5ef..587df27 100644
--- a/mesos-templates/marathon/0/rancher-compose.yml
+++ b/mesos-templates/marathon/0/rancher-compose.yml
@@ -4,17 +4,6 @@
   description: |
     Container orchestration platform for Mesos and DCOS
   questions:
-  - variable: ZK_SERVICE
-    description: Choose the Zookeeper service to use.
-    label: Zookeeper Service
-    required: true
-    type: service
-  # a stack type would be nice
-  - variable: MESOS_SERVICE
-    description: Choose the Mesos stack to use.
-    label: Mesos Stack
-    required: true
-    type: service
   - variable: MARATHON_HTTP_PORT
     description: Port to expose Marathon on.
     label: Marathon Port

From 672750917b2ea8664c9a006326dc452e5176f09b Mon Sep 17 00:00:00 2001
From: James Oliver <joliver@rancher.com>
Date: Mon, 23 May 2016 17:13:32 -0700
Subject: [PATCH 2/2] add NET_ADMIN cap to marathon framework

---
 mesos-templates/marathon/0/docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mesos-templates/marathon/0/docker-compose.yml b/mesos-templates/marathon/0/docker-compose.yml
index 1286814..7d80dae 100644
--- a/mesos-templates/marathon/0/docker-compose.yml
+++ b/mesos-templates/marathon/0/docker-compose.yml
@@ -6,3 +6,5 @@ marathon:
     MARATHON_HTTP_PORT: ${MARATHON_HTTP_PORT}
   ports:
   - "${MARATHON_HTTP_PORT}:${MARATHON_HTTP_PORT}"
+  cap_add:
+  - NET_ADMIN
\ No newline at end of file