Merge pull request #153 from LLParse/remove-extra-params

Remove zookeeper/mesos template parameters

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"

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

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}"

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

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}

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

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}"

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

mesos-templates/marathon/0/docker-compose.yml

@@ -1,8 +1,10 @@
 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}"
+  cap_add:
+  - NET_ADMIN

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