From fb7e4f88354904aecf9458d5a2e8c976ace98a7f Mon Sep 17 00:00:00 2001 From: James Oliver Date: Mon, 28 Nov 2016 12:55:06 -0700 Subject: [PATCH] code review changes --- infra-templates/mesos/1/docker-compose.yml | 2 +- infra-templates/mesos/1/rancher-compose.yml | 8 +- infra-templates/mesos/catalogIcon-mesos.png | Bin 0 -> 39040 bytes infra-templates/mesos/catalogIcon-mesos.svg | 76 ------------------ infra-templates/mesos/config.yml | 1 + .../marathon/1/rancher-compose.yml | 2 +- .../marathon/2/rancher-compose.yml | 2 +- mesos-templates/marathon/config.yml | 2 +- 8 files changed, 12 insertions(+), 81 deletions(-) create mode 100644 infra-templates/mesos/catalogIcon-mesos.png delete mode 100644 infra-templates/mesos/catalogIcon-mesos.svg diff --git a/infra-templates/mesos/1/docker-compose.yml b/infra-templates/mesos/1/docker-compose.yml index 91d618f..fefaf25 100644 --- a/infra-templates/mesos/1/docker-compose.yml +++ b/infra-templates/mesos/1/docker-compose.yml @@ -2,7 +2,7 @@ zookeeper: image: rancher/zookeeper:3.4.8 environment: ZK_ENSEMBLE_SIZE: ${ZOOKEEPER_SCALE} - JVMFLAGS: -Xmx512m -Xms512m + JVMFLAGS: ${ZOOKEEPER_JVM_FLAGS} CONFD_INTERVAL: 0 labels: io.rancher.scheduler.affinity:container_label_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name} diff --git a/infra-templates/mesos/1/rancher-compose.yml b/infra-templates/mesos/1/rancher-compose.yml index a5402a8..b6bb3a9 100644 --- a/infra-templates/mesos/1/rancher-compose.yml +++ b/infra-templates/mesos/1/rancher-compose.yml @@ -3,7 +3,7 @@ minimum_rancher_version: v1.2.0-pre4-rc1 questions: - variable: ZOOKEEPER_SCALE - label: Zookeeper Count + label: ZooKeeper Count description: Number of ZooKeeper nodes to launch. Only one node is scheduled to each host. required: true default: 3 @@ -21,6 +21,12 @@ type: enum options: - 3 + - variable: ZOOKEEPER_JVM_FLAGS + label: ZooKeeper JVM Flags + description: Flags to be passed to the JVM running ZooKeeper + required: false + default: -Xmx512m -Xms512m + type: string zookeeper: scale: ${ZOOKEEPER_SCALE} retain_ip: true diff --git a/infra-templates/mesos/catalogIcon-mesos.png b/infra-templates/mesos/catalogIcon-mesos.png new file mode 100644 index 0000000000000000000000000000000000000000..5b3d3da2caa268b6dbfded58c1fe23b89a794461 GIT binary patch literal 39040 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 Pn+Sv_-V1mCa8SzMl)^VC literal 0 HcmV?d00001 diff --git a/infra-templates/mesos/catalogIcon-mesos.svg b/infra-templates/mesos/catalogIcon-mesos.svg deleted file mode 100644 index eb0e3d8..0000000 --- a/infra-templates/mesos/catalogIcon-mesos.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/infra-templates/mesos/config.yml b/infra-templates/mesos/config.yml index 4055467..b484b3a 100644 --- a/infra-templates/mesos/config.yml +++ b/infra-templates/mesos/config.yml @@ -1,3 +1,4 @@ name: Mesos version: v0.28.1 category: Orchestration +description: A distributed systems kernel \ No newline at end of file diff --git a/mesos-templates/marathon/1/rancher-compose.yml b/mesos-templates/marathon/1/rancher-compose.yml index 538153a..60e177e 100644 --- a/mesos-templates/marathon/1/rancher-compose.yml +++ b/mesos-templates/marathon/1/rancher-compose.yml @@ -1,5 +1,5 @@ .catalog: - version: v1.1.1 + version: v1.1.1-rancher1 minimum_rancher_version: v1.0.0 maximum_rancher_version: v1.2.0-pre3 questions: diff --git a/mesos-templates/marathon/2/rancher-compose.yml b/mesos-templates/marathon/2/rancher-compose.yml index abb1247..ea78837 100644 --- a/mesos-templates/marathon/2/rancher-compose.yml +++ b/mesos-templates/marathon/2/rancher-compose.yml @@ -1,5 +1,5 @@ .catalog: - version: v1.1.1-2 + version: v1.1.1-rancher2 minimum_rancher_version: v1.2.0-pre4-rc1 questions: - variable: MARATHON_HTTP_PORT diff --git a/mesos-templates/marathon/config.yml b/mesos-templates/marathon/config.yml index 5099113..f2de379 100644 --- a/mesos-templates/marathon/config.yml +++ b/mesos-templates/marathon/config.yml @@ -1,6 +1,6 @@ name: Marathon description: | A production-grade container orchestration platform -version: v1.1.1-2 +version: v1.1.1-rancher2 category: Frameworks minimum_rancher_version: v1.0.0 \ No newline at end of file