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
@@ -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.