diff --git a/universe/marathon.json.mustache b/universe/marathon.json.mustache index d8b02c83..8a447f22 100644 --- a/universe/marathon.json.mustache +++ b/universe/marathon.json.mustache @@ -3,7 +3,7 @@ "cpus": 1.0, "mem": 1230, "instances": 1, - "cmd": "export PATH=$(ls -d $MESOS_SANDBOX/jre*/bin):$PATH && ./scheduler/bin/kafka-scheduler server ./scheduler/conf/scheduler.yml", + "cmd": "export LD_LIBRARY_PATH=$MESOS_SANDBOX/libmesos-bundle/lib:$LD_LIBRARY_PATH && export MESOS_NATIVE_JAVA_LIBRARY=$(ls $MESOS_SANDBOX/libmesos-bundle/lib/libmesos-*.so) && export PATH=$(ls -d $MESOS_SANDBOX/jre*/bin):$PATH && ./scheduler/bin/kafka-scheduler server ./scheduler/conf/scheduler.yml", "labels": { "DCOS_PACKAGE_FRAMEWORK_NAME": "{{service.name}}", "DCOS_MIGRATION_API_VERSION": "v1", @@ -140,7 +140,7 @@ "KAFKA_OVERRIDE_COMPRESSION_TYPE": "{{kafka.compression_type}}" {{#service.secret_name}} ,"DCOS_SERVICE_ACCOUNT_CREDENTIAL": { "secret": "serviceCredential" }, - "MESOS_MODULES": "file:///opt/mesosphere/etc/mesos-scheduler-modules/dcos_authenticatee_module.json", + "MESOS_MODULES": "{\"libraries\": [{\"file\": \"libdcos_security.so\", \"modules\": [{\"name\": \"com_mesosphere_dcos_ClassicRPCAuthenticatee\"}]}]}", "MESOS_AUTHENTICATEE": "com_mesosphere_dcos_ClassicRPCAuthenticatee" {{/service.secret_name}} }, @@ -154,7 +154,8 @@ "uris": [ "{{resource.assets.uris.jre-tar-gz}}", "{{resource.assets.uris.scheduler-zip}}", - "{{resource.assets.uris.kafka_tgz}}" + "{{resource.assets.uris.kafka_tgz}}", + "{{resource.assets.uris.libmesos-bundle-tar-gz}}" ], "healthChecks": [ { diff --git a/universe/resource.json b/universe/resource.json index 31e3491c..7217becb 100644 --- a/universe/resource.json +++ b/universe/resource.json @@ -5,7 +5,8 @@ "kafka_tgz": "https://downloads.mesosphere.com/kafka/assets/kafka_2.11-0.10.1.0.tgz", "scheduler-zip": "{{artifact-dir}}/scheduler.zip", "executor-zip": "{{artifact-dir}}/executor.zip", - "overrider-zip": "{{artifact-dir}}/overrider.zip" + "overrider-zip": "{{artifact-dir}}/overrider.zip", + "libmesos-bundle-tar-gz": "https://downloads.mesosphere.com/libmesos-bundle/libmesos-bundle-1.9-argus-1.1.x-3.tar.gz" } }, "images": {