cni network model changes

2016-11-23 17:50:30 -07:00
parent 2b2c8bd02f
commit 16b7c0c578
18 changed files with 151 additions and 11 deletions
@@ -1,5 +1,7 @@
 .catalog:
  version: v1.1.0
+  minimum_rancher_version: v1.0.0
+  maximum_rancher_version: v1.2.0-pre3
  questions:
  - variable: MARATHON_HTTP_PORT
    description: Port to expose Marathon on.
@@ -4,8 +4,6 @@ marathon:
    ZK_SERVICE: Mesos/zookeeper
    MESOS_SERVICE: Mesos/mesos-master
    MARATHON_HTTP_PORT: ${MARATHON_HTTP_PORT}
-  labels:
-    io.rancher.container.hostname_override: container_name
  ports:
  - "${MARATHON_HTTP_PORT}:${MARATHON_HTTP_PORT}"
-  privileged: true
+  privileged: true
@@ -1,5 +1,7 @@
 .catalog:
  version: v1.1.1
+  minimum_rancher_version: v1.0.0
+  maximum_rancher_version: v1.2.0-pre3
  questions:
  - variable: MARATHON_HTTP_PORT
    description: Port to expose Marathon on.
@@ -0,0 +1,11 @@
+marathon:
+  image: rancher/marathon:v1.1.1
+  environment:
+    ZK_SERVICE: mesos/zookeeper
+    MESOS_SERVICE: mesos/mesos-master
+    MARATHON_HTTP_PORT: ${MARATHON_HTTP_PORT}
+  labels:
+    io.rancher.container.hostname_override: container_name
+  ports:
+  - "${MARATHON_HTTP_PORT}:${MARATHON_HTTP_PORT}"
+  privileged: true
@@ -0,0 +1,19 @@
+.catalog:
+  version: v1.1.1-cni
+  minimum_rancher_version: v1.2.0-pre4-rc1
+  questions:
+  - variable: MARATHON_HTTP_PORT
+    description: Port to expose Marathon on.
+    label: Marathon Port
+    required: true
+    type: int
+    default: 8080
+marathon:
+  scale: 1
+  health_check:
+    port: ${MARATHON_HTTP_PORT}
+    interval: 3000
+    unhealthy_threshold: 2
+    healthy_threshold: 2
+    request_line: '/'
+    response_timeout: 2000
@@ -1,7 +1,6 @@
 name: Marathon
 description: |
  A production-grade container orchestration platform
-version: v1.1.1
+version: v1.1.1-cni
 category: Frameworks
-maintainer: James Oliver <joliver@rancher.com>
 minimum_rancher_version: v1.0.0