diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-03-02 10:39:25 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-03-02 10:39:34 +0000 |
commit | c0d285f4b03b176f1e1b5e4ac8968f2c8aa4492d (patch) | |
tree | da3f1fbc3889d6dbe20584434250ed673b84682d /share/config/container.conf.in | |
parent | Releasing debian version 20190222-1. (diff) | |
download | open-infrastructure-compute-tools-c0d285f4b03b176f1e1b5e4ac8968f2c8aa4492d.tar.xz open-infrastructure-compute-tools-c0d285f4b03b176f1e1b5e4ac8968f2c8aa4492d.zip |
Merging upstream version 20190301.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'share/config/container.conf.in')
-rw-r--r-- | share/config/container.conf.in | 13 |
1 files changed, 1 insertions, 12 deletions
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= |