mesos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ji...@apache.org
Subject [1/2] mesos git commit: Added CNI helper subcommand to `mesos-containerizer`.
Date Thu, 14 Apr 2016 16:17:55 GMT
Repository: mesos
Updated Branches:
  refs/heads/master e893f4959 -> 6dc9f025a


Added CNI helper subcommand to `mesos-containerizer`.

This will be used by the `network/cni` isolator to setup hostname and
various network files within the container UTS and mnt namespace.

Review: https://reviews.apache.org/r/45955/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3f745624
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3f745624
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3f745624

Branch: refs/heads/master
Commit: 3f745624c6e98a31050531324da444298ae9a66a
Parents: e893f49
Author: Avinash sridharan <avinash@mesosphere.io>
Authored: Thu Apr 14 09:14:34 2016 -0700
Committer: Jie Yu <yujie.jay@gmail.com>
Committed: Thu Apr 14 09:14:34 2016 -0700

----------------------------------------------------------------------
 src/slave/containerizer/mesos/main.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/3f745624/src/slave/containerizer/mesos/main.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/main.cpp b/src/slave/containerizer/mesos/main.cpp
index 63b257e..ed0c6cd 100644
--- a/src/slave/containerizer/mesos/main.cpp
+++ b/src/slave/containerizer/mesos/main.cpp
@@ -20,15 +20,29 @@
 #include "slave/containerizer/mesos/launch.hpp"
 #include "slave/containerizer/mesos/mount.hpp"
 
+#ifdef __linux__
+#include "slave/containerizer/mesos/isolators/network/cni/cni.hpp"
+#endif
+
 using namespace mesos::internal::slave;
 
 
 int main(int argc, char** argv)
 {
+#ifdef __linux__
+  return Subcommand::dispatch(
+      None(),
+      argc,
+      argv,
+      new MesosContainerizerLaunch(),
+      new MesosContainerizerMount(),
+      new NetworkCniIsolatorSetup());
+#else
   return Subcommand::dispatch(
       None(),
       argc,
       argv,
       new MesosContainerizerLaunch(),
       new MesosContainerizerMount());
+#endif
 }


Mime
View raw message