summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
Diffstat (limited to 'share')
-rw-r--r--share/bash-completion/container16
-rw-r--r--share/config/container.conf.in13
-rw-r--r--share/man/container-limit.1.txt109
-rw-r--r--share/man/container.1.txt3
4 files changed, 1 insertions, 140 deletions
diff --git a/share/bash-completion/container b/share/bash-completion/container
index 65c3950..4bc386a 100644
--- a/share/bash-completion/container
+++ b/share/bash-completion/container
@@ -98,22 +98,6 @@ _container()
esac
;;
- limit)
- case "${prev}" in
- -n|--name)
- opts="$(container list -a -f shell)"
- COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
- return 0
- ;;
-
- *)
- opts="-n --name --blockio-device-weight --blockio-read-bandwidth -b --blockio-weight --blockio-write-bandwidth -c --cpu-quota --cpu-shares -m --memory-limit -t --tasks-max"
- COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
- return 0
- ;;
- esac
- ;;
-
list|ls)
case "${prev}" in
-h|--host)
diff --git a/share/config/container.conf.in b/share/config/container.conf.in
index ebf91b9..b0f35cb 100644
--- a/share/config/container.conf.in
+++ b/share/config/container.conf.in
@@ -1,6 +1,5 @@
-# compute-tools: @NAME@
+# /etc/open-infrastructure/container/config/@NAME@.conf
-[start]
cnt.auto=@CNT_AUTO@
cnt.container-server=@CNT_CONTAINER_SERVER@
cnt.network-bridge=@CNT_NETWORK_BRIDGE@
@@ -16,13 +15,3 @@ machine=@MACHINE@
network-veth-extra=@NETWORK_VETH_EXTRA@
private-users=@PRIVATE_USERS@
register=@REGISTER@
-
-[limit]
-BlockIODeviceWeight=
-BlockIOReadBandwidth=
-BlockIOWeight=
-BlockIOWriteBandwidth=
-CPUQuota=
-CPUShares=
-MemoryLimit=
-TasksMax=
diff --git a/share/man/container-limit.1.txt b/share/man/container-limit.1.txt
deleted file mode 100644
index 62f0288..0000000
--- a/share/man/container-limit.1.txt
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-CONTAINER-LIMIT(1)
-==================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-limit - Limit ressources of a container
-
-
-SYNOPSIS
---------
-*container limit* ['OPTIONS']
-
-
-DESCRIPTION
------------
-The container limit command limits ressources available to a container at runtime.
-
-
-OPTIONS
--------
-The following container options are available:
-
-*-n, --name='NAME'*::
- Specify container name.
-
-*--blockio-device-weight='DEVICE WEIGHT'*::
- Specify device specific blockio weight, see systemd.resource-control(5).
-
-*--blockio-read-bandwidth='DEVICE BYTES'*::
- Specify device specific blockio read bandwidth, see systemd.resource-control(5).
-
-*-b, --blockio-weight='WEIGHT'*::
- Specify general blockio weight, see systemd.resource-control(5).
-
-*--blockio-write-bandwidth='DEVICE BYTES'*::
- Specify device specific blockio write bandwidth, see systemd.resource-control(5).
-
-*-c, --cpu-quota='QUOTA'*::
- Specify CPU quota, see systemd.resource-control(5).
-
-*--cpu-shares='SHARES'*::
- Specify CPU shares, see systemd.resource-control(5).
-
-*-m, --memory-limit='BYTES'*::
- Specify memory limit, see systemd.resource-control(5).
-
-*-t, --tasks-max='NUMBER'*::
- Specify tasks max, see systemd.resource-control(5).
-
-
-EXAMPLES
---------
-*Set blockio weight for the example.net container:*::
- sudo container limit -n example.net --blockio-weight 100
-
-*Set CPU quota for the example.net container:*::
- sudo container limit -n example.net --cpu-quota 10%
-
-*Set memory limit for the example.net container to 1GB:*::
- sudo container limit -n example.net --memory-limit 1G
-
-*Set tasks max for the example.net container to 100:*::
- sudo container limit -n example.net --tasks-max 100
-
-
-SEE ALSO
---------
-compute-tools(7),
-container(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-CONTACT
--------
-Bug reports, feature requests, help, patches, support and everything else
-are welcome on the Open Infrastructure Software Mailing List <software@lists.open-infrastructure.net>.
-
-Debian specific bugs can also be reported in the Debian Bug Tracking System at https://bugs.debian.org.
-
-
-AUTHORS
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container.1.txt b/share/man/container.1.txt
index 87232d0..224d6cc 100644
--- a/share/man/container.1.txt
+++ b/share/man/container.1.txt
@@ -75,9 +75,6 @@ The following container commands are available:
*enter*::
Enter a container namespace, see container-enter(1).
-*limit*::
- Limit ressources of a container, see container-limit(1).
-
*list*::
List container on the system, see container-list(1).