cni network model changes

infra-templates/mesos/0/rancher-compose.yml

@@ -1,6 +1,7 @@
 .catalog:
   version: v0.28.0
-  minimum_rancher_version: 1.2.0-pre4-rc1
+  minimum_rancher_version: v1.0.0
+  maximum_rancher_version: v1.2.0-pre3
 zookeeper:
   scale: 3
   retain_ip: true

infra-templates/mesos/1/docker-compose.yml

@@ -0,0 +1,49 @@
+zookeeper:
+  image: rancher/zookeeper:3.4.8
+  environment:
+    ZK_ENSEMBLE_SIZE: ${ZOOKEEPER_SCALE}
+    JVMFLAGS: -Xmx512m -Xms512m
+    CONFD_INTERVAL: 0
+  labels:
+    io.rancher.scheduler.affinity:container_label_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name}
+    io.rancher.sidekicks: zookeeper-data
+  volumes_from:
+  - zookeeper-data
+zookeeper-data:
+  image: busybox
+  entrypoint: /bin/true
+  labels:
+    io.rancher.scheduler.affinity:container_label_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name}
+    io.rancher.container.start_once: 'true'
+  net: none
+  volumes:
+  - /data
+mesos-master:
+  image: rancher/mesos-master:latest
+  environment:
+    MESOS_CLUSTER: Rancher
+    MESOS_QUORUM: 2
+    MASTER_PORT: 5050
+    ZK_SERVICE: mesos/zookeeper
+    ZK_SESSION_TIMEOUT: 10secs
+  ports:
+  - "5050:5050"
+  labels:
+    io.rancher.scheduler.affinity:container_label_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name}
+  volumes:
+  - /data
+mesos-slave:
+  image: rancher/mesos-slave:latest
+  environment:
+    SLAVE_PORT: 5051
+    ZK_SERVICE: mesos/zookeeper
+  ports:
+  - "5051:5051"
+  labels:
+    io.rancher.container.hostname_override: container_name
+    io.rancher.scheduler.affinity:container_label_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name}
+    io.rancher.scheduler.global: "true"
+  volumes:
+  - /var/run/docker.sock:/var/run/docker.sock
+  - /data
+  privileged: true

infra-templates/mesos/1/rancher-compose.yml

@@ -0,0 +1,51 @@
+.catalog:
+  version: v0.28.1
+  minimum_rancher_version: v1.2.0-pre4-rc1
+  questions:
+  - variable: ZOOKEEPER_SCALE
+    label: Zookeeper Count
+    description: Number of ZooKeeper nodes to launch. Only one node is scheduled to each host.
+    required: true
+    default: 3
+    type: enum
+    options:
+    - 1
+    - 3
+    - 5
+    - 7
+  - variable: MESOS_MASTER_SCALE
+    label: Mesos Master Count
+    description: Number of Mesos Master nodes to launch. Only one node is scheduled to each host.
+    required: true
+    default: 3
+    type: enum
+    options:
+    - 3
+zookeeper:
+  scale: ${ZOOKEEPER_SCALE}
+  retain_ip: true
+  health_check:
+    port: 2181
+    interval: 5000
+    unhealthy_threshold: 2
+    healthy_threshold: 2
+    request_line: ''
+    response_timeout: 5000
+mesos-master:
+  scale: ${MESOS_MASTER_SCALE}
+  retain_ip: true
+  health_check:
+    port: 5050
+    interval: 5000
+    unhealthy_threshold: 2
+    healthy_threshold: 2
+    request_line: '/metrics/snapshot'
+    response_timeout: 5000
+mesos-slave:
+  health_check:
+    port: 5051
+    interval: 5000
+    unhealthy_threshold: 2
+    healthy_threshold: 2
+    request_line: ''
+    response_timeout: 5000

infra-templates/mesos/config.yml

@@ -1,3 +1,3 @@
 name: Mesos
-version: v0.28.0
+version: v0.28.1
 category: Orchestration

mesos-templates/marathon/2/rancher-compose.yml

@@ -1,5 +1,5 @@
 .catalog:
-  version: v1.1.1-cni
+  version: v1.1.1-2
   minimum_rancher_version: v1.2.0-pre4-rc1
   questions:
   - variable: MARATHON_HTTP_PORT

mesos-templates/marathon/config.yml

@@ -1,6 +1,6 @@
 name: Marathon
 description: |
   A production-grade container orchestration platform
-version: v1.1.1-cni
+version: v1.1.1-2
 category: Frameworks
 minimum_rancher_version: v1.0.0