Merge "Disable live-restore by default"

This commit is contained in:
Zuul 2018-05-04 14:07:18 +00:00 committed by Gerrit Code Review
commit 424d0f9c51
2 changed files with 2 additions and 2 deletions

View File

@ -35,7 +35,7 @@ docker_registry_ca:
docker_daemon_mtu: 1500 docker_daemon_mtu: 1500
# Enable live-restore on docker daemon # Enable live-restore on docker daemon
docker_daemon_live_restore: true docker_daemon_live_restore: false
# Upper constraints file which is passed to pip when installing packages # Upper constraints file which is passed to pip when installing packages
# into a venv. # into a venv.

View File

@ -14,7 +14,7 @@ Features
should be a dict of repositories. should be a dict of repositories.
* Adds support for configuration of live-restore option in docker. This is * Adds support for configuration of live-restore option in docker. This is
enabled by setting the variable ``docker_daemon_live_restore``. Option is enabled by setting the variable ``docker_daemon_live_restore``. Option is
set to true by default. set to false by default.
* Facilitates deployment of TLS certificate bundles in environments * Facilitates deployment of TLS certificate bundles in environments
where SSL is required. To use this feature, populate the contents where SSL is required. To use this feature, populate the contents
of the variable ``kolla_tls_cert`` - this will then be copied in to of the variable ``kolla_tls_cert`` - this will then be copied in to