Make worker-multiplier sane in container environments

Resync charm-helpers to pickup the capped worker-multiplier
changes when deploying in containers.

Drop the default value for worker-multiplier of 2.0; this
is now handled from within the codebase rather than via a
default configuration value, reflecting the differing
behaviours between container and non-container deployments.

Change-Id: I418aac85c408b285cf6807ff4072e565898df399
Closes-Bug: 1665270
This commit is contained in:
James Page
2017-03-30 10:58:11 +01:00
parent 6b5ffc13a9
commit 074263eaa7
30 changed files with 507 additions and 120 deletions

View File

@@ -289,11 +289,13 @@ options:
your network interface.
worker-multiplier:
type: float
default: 2.0
default:
description: |
The CPU core multiplier to use when configuring worker processes for
Glance. By default, the number of workers for each daemon is set to
twice the number of CPU cores a service unit has.
twice the number of CPU cores a service unit has. When deployed in
a LXD container, this default value will be capped to 4 workers
unless this configuration option is set.
nagios_context:
default: "juju"
type: string