forked from evolix/ansible-roles
lxc: update our default template to be compatible with Debian 10
This commit is contained in:
parent
ae97276e13
commit
a5378c783e
|
@ -39,6 +39,7 @@ The **patch** part changes incrementally at each release.
|
||||||
* squid: split systemd tasks into own file
|
* squid: split systemd tasks into own file
|
||||||
* varnish: remove custom ExecReload= script for Debian 10+
|
* varnish: remove custom ExecReload= script for Debian 10+
|
||||||
* lxc: remove useless loop in apt execution
|
* lxc: remove useless loop in apt execution
|
||||||
|
* lxc: update our default template to be compatible with Debian 10
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
* lxc-php: Don't remove the default pool
|
* lxc-php: Don't remove the default pool
|
||||||
|
|
|
@ -7,7 +7,12 @@ lxc.id_map = g 0 100000 10000
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
# Set the default network virtualization method.
|
# Set the default network virtualization method.
|
||||||
|
{% if ansible_distribution_major_version | version_compare('9', '<=') %}
|
||||||
lxc.network.type = {{lxc_network_type}}
|
lxc.network.type = {{lxc_network_type}}
|
||||||
|
{% else %}
|
||||||
|
lxc.net.0.type = {{lxc_network_type}}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
|
||||||
{% if lxc_mount_part %}
|
{% if lxc_mount_part %}
|
||||||
# Mount {{lxc_mount_part}} into containers.
|
# Mount {{lxc_mount_part}} into containers.
|
||||||
|
@ -16,7 +21,11 @@ lxc.mount.entry = {{lxc_mount_part}} {{lxc_mount_part |replace('/', '')}} none b
|
||||||
{% endif %}
|
{% endif %}
|
||||||
# Only one tty is enough.
|
# Only one tty is enough.
|
||||||
# This require that you disabled others tty ([2-6]) in systemd.
|
# This require that you disabled others tty ([2-6]) in systemd.
|
||||||
|
{% if ansible_distribution_major_version | version_compare('9', '<=') %}
|
||||||
lxc.tty = 1
|
lxc.tty = 1
|
||||||
|
{% else %}
|
||||||
|
lxc.tty.max = 1
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
# Run 64bits containers
|
# Run 64bits containers
|
||||||
lxc.arch = x86_64
|
lxc.arch = x86_64
|
||||||
|
|
Loading…
Reference in a new issue