Merge "Disable Telemetry services on undercloud by default"

This commit is contained in:
Jenkins 2017-04-21 00:41:01 +00:00 committed by Gerrit Code Review
commit 7631f1d3bb
4 changed files with 14 additions and 4 deletions

View File

@ -157,7 +157,7 @@ class { '::heat::db::mysql':
dbname => $heat_dsn[6],
allowed_hosts => $allowed_hosts,
}
if str2bool(hiera('enable_telemetry', true)) {
if str2bool(hiera('enable_telemetry', false)) {
# Ceilometer

View File

@ -298,9 +298,9 @@ _opts = [
help=('Whether to install Tempest in the Undercloud.')
),
cfg.BoolOpt('enable_telemetry',
default=True,
default=False,
help=('Whether to install Telemetry services '
'(ceilometer, aodh) in the Undercloud.')
'(ceilometer, gnocchi, aodh, panko ) in the Undercloud.')
),
cfg.BoolOpt('enable_ui',
default=True,

View File

@ -0,0 +1,10 @@
---
upgrade:
- If you had telemetry enabled in Ocata and you upgrade to pike with
defaults, the telemetry services will be disabled upon upgrade. If
you choose to keep it enabled, set the enable_telemetry option to
true before upgrade and services will continue to be enabled after upgrade.
fixes:
- Finally disabling telemetry services on undercloud by default. Telemetry
use case has been quite limited on undercloud and it makes sense to
disable by default and let user enabl based on need.

View File

@ -154,7 +154,7 @@
# Whether to install Telemetry services (ceilometer, aodh) in the
# Undercloud. (boolean value)
#enable_telemetry = true
#enable_telemetry = false
# Whether to install the TripleO UI. (boolean value)
#enable_ui = true