evolix/ansible-roles
22
2
Fork 2
Code Issues 61 Pull requests 18 Releases 32 Wiki Activity

lxc: update our default template to be compatible with Debian 10

Browse source
This commit is contained in:
Ludovic Poujol 2019-10-01 17:54:07 +02:00
parent ae97276e13
commit a5378c783e
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -39,6 +39,7 @@ The **patch** part changes incrementally at each release.
* squid: split systemd tasks into own file
* varnish: remove custom ExecReload= script for Debian 10+
* lxc: remove useless loop in apt execution
* lxc: update our default template to be compatible with Debian 10
### Fixed
* lxc-php: Don't remove the default pool

9
lxc/templates/default.conf
View file

@ -7,7 +7,12 @@ lxc.id_map = g 0 100000 10000
{% endif %}
# Set the default network virtualization method.
{% if ansible_distribution_major_version | version_compare('9', '<=') %}
lxc.network.type = {{lxc_network_type}}
{% else %}
lxc.net.0.type = {{lxc_network_type}}
{% endif %}
{% if lxc_mount_part %}
# Mount {{lxc_mount_part}} into containers.
@ -16,7 +21,11 @@ lxc.mount.entry = {{lxc_mount_part}} {{lxc_mount_part |replace('/', '')}} none b
{% endif %}
# Only one tty is enough.
# This require that you disabled others tty ([2-6]) in systemd.
{% if ansible_distribution_major_version | version_compare('9', '<=') %}
lxc.tty = 1
{% else %}
lxc.tty.max = 1
{% endif %}
# Run 64bits containers
lxc.arch = x86_64