[prev in list] [next in list] [prev in thread] [next in thread]
List: mesos-commits
Subject: mesos git commit: Enabled CNI and Resource Providers in Mesos mini container.
From: jieyu () apache ! org
Date: 2018-02-27 6:08:46
Message-ID: 431062be14a5499a9bae95a1db4ab3e8 () git ! apache ! org
[Download RAW message or body]
Repository: mesos
Updated Branches:
refs/heads/master 5eee77f4b -> b7933c176
Enabled CNI and Resource Providers in Mesos mini container.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b7933c17
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b7933c17
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b7933c17
Branch: refs/heads/master
Commit: b7933c176d719766bdb6459048ede6e94f6a7763
Parents: 5eee77f
Author: Jie Yu <yujie.jay@gmail.com>
Authored: Mon Feb 26 22:07:54 2018 -0800
Committer: Jie Yu <yujie.jay@gmail.com>
Committed: Mon Feb 26 22:08:40 2018 -0800
----------------------------------------------------------------------
support/mesos-mini/Dockerfile | 13 ++++++++----
support/mesos-mini/mesos/agent_environment | 17 +++++++++++++++
support/mesos-mini/mesos/agent_features.json | 8 +++++++
support/mesos-mini/mesos/master_environment | 3 +++
.../mesos/modules/uri_disk_profile.json | 22 ++++++++++++++++++++
support/mesos-mini/mesos_agent_environment | 11 ----------
support/mesos-mini/mesos_master_environment | 3 ---
7 files changed, 59 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b7933c17/support/mesos-mini/Dockerfile
----------------------------------------------------------------------
diff --git a/support/mesos-mini/Dockerfile b/support/mesos-mini/Dockerfile
index 0693310..f9bcdb5 100644
--- a/support/mesos-mini/Dockerfile
+++ b/support/mesos-mini/Dockerfile
@@ -45,10 +45,15 @@ COPY docker_daemon.json /etc/docker/daemon.json
# Prepare Mesos environment.
RUN chmod +x /usr/bin/mesos-init-wrapper && \
rm -f /etc/mesos-master/work_dir && \
- rm -f /etc/mesos-slave/work_dir
-
-COPY mesos_master_environment /etc/default/mesos-master
-COPY mesos_agent_environment /etc/default/mesos-agent
+ rm -f /etc/mesos-slave/work_dir && \
+ mkdir -p /etc/mesos/resource_providers && \
+ mkdir -p /etc/mesos/cni && \
+ mkdir -p /usr/libexec/mesos/cni
+
+COPY mesos/master_environment /etc/default/mesos-master
+COPY mesos/agent_environment /etc/default/mesos-agent
+COPY mesos/agent_features.json /etc/mesos/agent_features.json
+COPY mesos/modules /etc/mesos/modules
# Prepare Marathon environment.
ARG MARATHON_URL=https://downloads.mesosphere.com/marathon/releases/1.5.5/marathon-1.5.5.tgz
http://git-wip-us.apache.org/repos/asf/mesos/blob/b7933c17/support/mesos-mini/mesos/agent_environment
----------------------------------------------------------------------
diff --git a/support/mesos-mini/mesos/agent_environment \
b/support/mesos-mini/mesos/agent_environment new file mode 100644
index 0000000..c0dccae99
--- /dev/null
+++ b/support/mesos-mini/mesos/agent_environment
@@ -0,0 +1,17 @@
+MESOS_ADVERTISE_IP=127.0.0.1
+MESOS_HOSTNAME_LOOKUP=false
+MESOS_WORK_DIR=/var/lib/mesos/agent
+MESOS_MASTER=127.0.0.1:5050
+MESOS_CONTAINERIZERS=mesos,docker
+MESOS_ISOLATION=filesystem/linux,network/cni,cgroups/cpu,cgroups/mem,cgroups/blkio,cg \
roups/devices,disk/du,docker/runtime,volume/sandbox_path,volume/host_path,posix/rlimits,namespaces/pid,linux/capabilities
+MESOS_LAUNCHER=linux
+MESOS_CGROUPS_ROOT=`grep memory /proc/1/cgroup | cut -d: -f3`/mesos
+MESOS_IMAGE_PROVIDERS=DOCKER
+MESOS_IMAGE_PROVISIONER_BACKEND=copy
+MESOS_NETWORK_CNI_CONFIG_DIR=/etc/mesos/cni
+MESOS_NETWORK_CNI_PLUGINS_DIR=/usr/libexec/mesos/cni/:/usr/libexec/mesos/
+MESOS_SYSTEMD_ENABLE_SUPPORT=false
+MESOS_AGENT_FEATURES=file:///etc/mesos/agent_features.json
+MESOS_RESOURCE_PROVIDER_CONFIG_DIR=/etc/mesos/resource_providers
+MESOS_DISK_PROFILE_ADAPTOR=org_apache_mesos_UriDiskProfileAdaptor
+MESOS_MODULES_DIR=/etc/mesos/modules
http://git-wip-us.apache.org/repos/asf/mesos/blob/b7933c17/support/mesos-mini/mesos/agent_features.json
----------------------------------------------------------------------
diff --git a/support/mesos-mini/mesos/agent_features.json \
b/support/mesos-mini/mesos/agent_features.json new file mode 100644
index 0000000..a66852a
--- /dev/null
+++ b/support/mesos-mini/mesos/agent_features.json
@@ -0,0 +1,8 @@
+{
+ "capabilities": [
+ { "type": "MULTI_ROLE" },
+ { "type": "HIERARCHICAL_ROLE" },
+ { "type": "RESERVATION_REFINEMENT" },
+ { "type": "RESOURCE_PROVIDER"}
+ ]
+}
http://git-wip-us.apache.org/repos/asf/mesos/blob/b7933c17/support/mesos-mini/mesos/master_environment
----------------------------------------------------------------------
diff --git a/support/mesos-mini/mesos/master_environment \
b/support/mesos-mini/mesos/master_environment new file mode 100644
index 0000000..0382558
--- /dev/null
+++ b/support/mesos-mini/mesos/master_environment
@@ -0,0 +1,3 @@
+MESOS_ADVERTISE_IP=127.0.0.1
+MESOS_HOSTNAME_LOOKUP=false
+MESOS_WORK_DIR=/var/lib/mesos/master
http://git-wip-us.apache.org/repos/asf/mesos/blob/b7933c17/support/mesos-mini/mesos/modules/uri_disk_profile.json
----------------------------------------------------------------------
diff --git a/support/mesos-mini/mesos/modules/uri_disk_profile.json \
b/support/mesos-mini/mesos/modules/uri_disk_profile.json new file mode 100644
index 0000000..53bdded
--- /dev/null
+++ b/support/mesos-mini/mesos/modules/uri_disk_profile.json
@@ -0,0 +1,22 @@
+{
+ "libraries": [
+ {
+ "file": "/usr/lib64/mesos/modules/liburi_disk_profile.so",
+ "modules": [
+ {
+ "name": "org_apache_mesos_UriDiskProfileAdaptor",
+ "parameters": [
+ {
+ "key": "uri",
+ "value": "http://localhost/mesos_disk_profiles.json"
+ },
+ {
+ "key": "poll_interval",
+ "value": "10secs"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/mesos/blob/b7933c17/support/mesos-mini/mesos_agent_environment
----------------------------------------------------------------------
diff --git a/support/mesos-mini/mesos_agent_environment \
b/support/mesos-mini/mesos_agent_environment deleted file mode 100644
index 99e5b4b..0000000
--- a/support/mesos-mini/mesos_agent_environment
+++ /dev/null
@@ -1,11 +0,0 @@
-MESOS_ADVERTISE_IP=127.0.0.1
-MESOS_HOSTNAME_LOOKUP=false
-MESOS_WORK_DIR=/var/lib/mesos/agent
-MESOS_MASTER=127.0.0.1:5050
-MESOS_CONTAINERIZERS=mesos,docker
-MESOS_ISOLATION=filesystem/linux,network/cni,cgroups/cpu,cgroups/mem,cgroups/blkio,cg \
roups/devices,disk/du,docker/runtime,volume/sandbox_path,volume/host_path,posix/rlimits,namespaces/pid,linux/capabilities
-MESOS_LAUNCHER=linux
-MESOS_CGROUPS_ROOT=`grep memory /proc/1/cgroup | cut -d: -f3`/mesos
-MESOS_IMAGE_PROVIDERS=DOCKER
-MESOS_IMAGE_PROVISIONER_BACKEND=copy
-MESOS_SYSTEMD_ENABLE_SUPPORT=false
http://git-wip-us.apache.org/repos/asf/mesos/blob/b7933c17/support/mesos-mini/mesos_master_environment
----------------------------------------------------------------------
diff --git a/support/mesos-mini/mesos_master_environment \
b/support/mesos-mini/mesos_master_environment deleted file mode 100644
index 0382558..0000000
--- a/support/mesos-mini/mesos_master_environment
+++ /dev/null
@@ -1,3 +0,0 @@
-MESOS_ADVERTISE_IP=127.0.0.1
-MESOS_HOSTNAME_LOOKUP=false
-MESOS_WORK_DIR=/var/lib/mesos/master
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic