diff --git a/cluster/saltbase/salt/docker/docker-init b/cluster/saltbase/salt/docker/docker-init deleted file mode 100755 index 18c7c5c4523..00000000000 --- a/cluster/saltbase/salt/docker/docker-init +++ /dev/null @@ -1,149 +0,0 @@ -#!/bin/sh - -### BEGIN INIT INFO -# Provides: docker -# Required-Start: $syslog $remote_fs -# Required-Stop: $syslog $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Create lightweight, portable, self-sufficient containers. -# Description: -# Docker is an open-source project to easily create lightweight, portable, -# self-sufficient containers from any application. The same container that a -# developer builds and tests on a laptop can run at scale, in production, on -# VMs, bare metal, OpenStack clusters, public clouds and more. -### END INIT INFO - -export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin - -BASE=$(basename $0) - -# modify these in /etc/default/$BASE (/etc/default/docker) -# HACK: DOCKER overridable to allow image builder to run this, too. -DOCKER=${DOCKER:-/usr/bin/$BASE} -DOCKER_PIDFILE=/var/run/$BASE.pid -DOCKER_LOGFILE=/var/log/$BASE.log -DOCKER_OPTS= -DOCKER_DESC="Docker" - -# Get lsb functions -. /lib/lsb/init-functions - -if [ -f /etc/default/$BASE ]; then - . /etc/default/$BASE -fi - -# see also init_is_upstart in /lib/lsb/init-functions (which isn't available in Ubuntu 12.04, or we'd use it) -if [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | grep -q upstart; then - log_failure_msg "$DOCKER_DESC is managed via upstart, try using service $BASE $1" - exit 1 -fi - -# Check docker is present -if [ ! -x $DOCKER ]; then - log_failure_msg "$DOCKER not present or not executable" - exit 1 -fi - -fail_unless_root() { - if [ "$(id -u)" != '0' ]; then - log_failure_msg "$DOCKER_DESC must be run as root" - exit 1 - fi -} - -cgroupfs_mount() { - # see also https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount - if grep -v '^#' /etc/fstab | grep -q cgroup \ - || [ ! -e /proc/cgroups ] \ - || [ ! -d /sys/fs/cgroup ]; then - return - fi - if ! mountpoint -q /sys/fs/cgroup; then - mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup - fi - ( - cd /sys/fs/cgroup - for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do - mkdir -p $sys - if ! mountpoint -q $sys; then - if ! mount -n -t cgroup -o $sys cgroup $sys; then - rmdir $sys || true - fi - fi - done - ) -} - -case "$1" in - mount) # HACK: Used in image build - fail_unless_root - - cgroupfs_mount - - log_end_msg $? - ;; - - start) - fail_unless_root - - cgroupfs_mount - - # TODO: Find a better place to do this! - echo 1 > /sys/fs/cgroup/memory/memory.use_hierarchy - - touch "$DOCKER_LOGFILE" - chgrp docker "$DOCKER_LOGFILE" - - if [ -n "$DOCKER_NOFILE" ]; then - ulimit -n $DOCKER_NOFILE - fi - - if [ -n "$DOCKER_LOCKEDMEMORY" ]; then - ulimit -l $DOCKER_LOCKEDMEMORY - fi - - log_begin_msg "Starting $DOCKER_DESC: $BASE" - start-stop-daemon --start --background \ - --no-close \ - --exec "$DOCKER" \ - --pidfile "$DOCKER_PIDFILE" \ - -- \ - daemon -p "$DOCKER_PIDFILE" \ - $DOCKER_OPTS \ - >> "$DOCKER_LOGFILE" 2>&1 - log_end_msg $? - ;; - - stop) - fail_unless_root - log_begin_msg "Stopping $DOCKER_DESC: $BASE" - start-stop-daemon --stop --pidfile "$DOCKER_PIDFILE" - log_end_msg $? - ;; - - restart) - fail_unless_root - docker_pid=`cat "$DOCKER_PIDFILE" 2>/dev/null` - [ -n "$docker_pid" ] \ - && ps -p $docker_pid > /dev/null 2>&1 \ - && $0 stop - $0 start - ;; - - force-reload) - fail_unless_root - $0 restart - ;; - - status) - status_of_proc -p "$DOCKER_PIDFILE" "$DOCKER" docker - ;; - - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 - ;; -esac - -exit 0 diff --git a/cluster/saltbase/salt/docker/init.sls b/cluster/saltbase/salt/docker/init.sls index 6e1f5a85739..493ea6a77eb 100644 --- a/cluster/saltbase/salt/docker/init.sls +++ b/cluster/saltbase/salt/docker/init.sls @@ -162,15 +162,6 @@ docker: file.replace: - pattern: '^net.ipv4.ip_forward=0' - repl: '# net.ipv4.ip_forward=0' - -/etc/init.d/docker: - file.managed: - - source: salt://docker/docker-init - - template: jinja - - user: root - - group: root - - mode: 755 - - makedirs: true {% endif %} # Work around Salt #18089: https://github.com/saltstack/salt/issues/18089