From bb03c120a97a53aa4cbc21a03cbf2bb633b10397 Mon Sep 17 00:00:00 2001 From: Pradeep Kilambi Date: Wed, 19 Apr 2017 12:24:28 -0400 Subject: [PATCH] Disable Telemetry services on undercloud by default Finally lets disable by default. The use case for telemetry has been quite slim anyway. The interested users now seem to be ok with enabling it manually when needed. So lets do this! Change-Id: Ic35bcf4f789a3f30e4634789e965203be74d2e8c --- elements/puppet-stack-config/puppet-stack-config.pp | 2 +- instack_undercloud/undercloud.py | 4 ++-- .../disable-telemetry-by-default-d596b78fc08df1a9.yaml | 10 ++++++++++ undercloud.conf.sample | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/disable-telemetry-by-default-d596b78fc08df1a9.yaml diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp index e020bc585..65047da07 100644 --- a/elements/puppet-stack-config/puppet-stack-config.pp +++ b/elements/puppet-stack-config/puppet-stack-config.pp @@ -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 diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py index 0c610a006..90c5fa32e 100644 --- a/instack_undercloud/undercloud.py +++ b/instack_undercloud/undercloud.py @@ -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, diff --git a/releasenotes/notes/disable-telemetry-by-default-d596b78fc08df1a9.yaml b/releasenotes/notes/disable-telemetry-by-default-d596b78fc08df1a9.yaml new file mode 100644 index 000000000..b5ac7cf0f --- /dev/null +++ b/releasenotes/notes/disable-telemetry-by-default-d596b78fc08df1a9.yaml @@ -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. diff --git a/undercloud.conf.sample b/undercloud.conf.sample index 2d4bb6bc6..8125ea38f 100644 --- a/undercloud.conf.sample +++ b/undercloud.conf.sample @@ -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