Wired in the Cert installer (#344)

mesosphere · Feb 13, 2017 · 2612216 · 2612216
1 parent 21af9ef
commit 2612216
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/kafka-scheduler/src/main/java/com/mesosphere/dcos/kafka/scheduler/KafkaScheduler.java b/kafka-scheduler/src/main/java/com/mesosphere/dcos/kafka/scheduler/KafkaScheduler.java
@@ -33,23 +33,24 @@
 import org.apache.mesos.config.ConfigStoreException;
 import org.apache.mesos.config.RecoveryConfiguration;
 import org.apache.mesos.config.api.ConfigResource;
+import org.apache.mesos.dcos.DCOSCertInstaller;
 import org.apache.mesos.dcos.DcosCluster;
 import org.apache.mesos.offer.*;
 import org.apache.mesos.reconciliation.DefaultReconciler;
 import org.apache.mesos.reconciliation.Reconciler;
-import org.apache.mesos.scheduler.Observer;
-import org.apache.mesos.scheduler.TaskKiller;
-import org.apache.mesos.scheduler.SchedulerDriverFactory;
-import org.apache.mesos.scheduler.SchedulerErrorCode;
-import org.apache.mesos.scheduler.DefaultTaskKiller;
+import org.apache.mesos.scheduler.*;
 import org.apache.mesos.scheduler.Observable;
+import org.apache.mesos.scheduler.Observer;
 import org.apache.mesos.scheduler.api.TaskResource;
 import org.apache.mesos.scheduler.plan.*;
 import org.apache.mesos.scheduler.plan.api.PlansResource;
 import org.apache.mesos.scheduler.plan.strategy.CanaryStrategy;
 import org.apache.mesos.scheduler.plan.strategy.SerialStrategy;
 import org.apache.mesos.scheduler.plan.strategy.Strategy;
-import org.apache.mesos.scheduler.recovery.*;
+import org.apache.mesos.scheduler.recovery.DefaultRecoveryPlanManager;
+import org.apache.mesos.scheduler.recovery.DefaultTaskFailureListener;
+import org.apache.mesos.scheduler.recovery.RecoveryRequirementProvider;
+import org.apache.mesos.scheduler.recovery.TaskFailureListener;
 import org.apache.mesos.scheduler.recovery.constrain.LaunchConstrainer;
 import org.apache.mesos.scheduler.recovery.constrain.TimedLaunchConstrainer;
 import org.apache.mesos.state.api.JsonPropertyDeserializer;
@@ -154,6 +155,10 @@ private void initialize(SchedulerDriver driver) {
         planCoordinator = new DefaultPlanCoordinator(ImmutableList.of(planManager, repairPlanManager), planScheduler);
 
         startApiServer();
+
+        String javaHome = System.getenv("JAVA_HOME");
+        boolean certInstalled = DCOSCertInstaller.installCertificate(javaHome);
+        log.info("Attempt to install cert into: " + javaHome + " was " + (certInstalled ? "successful" : "a failure"));
     }
 
     private void startApiServer() {

diff --git a/universe/marathon.json.mustache b/universe/marathon.json.mustache
@@ -15,6 +15,7 @@
   },
   "env": {
     "LD_LIBRARY_PATH": "/opt/mesosphere/lib",
+    "JAVA_HOME":"./jre1.8.0_121",
     "FRAMEWORK_NAME": "{{service.name}}",
     "FRAMEWORK_PRINCIPAL": "{{service.principal}}",
     "USER": "{{service.user}}",