diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp index dbe1aec7b..f9547803d 100644 --- a/elements/puppet-stack-config/puppet-stack-config.pp +++ b/elements/puppet-stack-config/puppet-stack-config.pp @@ -156,7 +156,7 @@ if str2bool(hiera('enable_telemetry', true)) { include ::ceilometer::keystone::auth include ::aodh::keystone::auth include ::ceilometer - if str2bool(hiera('enable_legacy_ceilometer_api', false)) { + if str2bool(hiera('enable_legacy_ceilometer_api', true)) { include ::ceilometer::api } include ::ceilometer::wsgi::apache diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py index 09a746e24..c719893c7 100644 --- a/instack_undercloud/undercloud.py +++ b/instack_undercloud/undercloud.py @@ -306,9 +306,12 @@ _opts = [ help=('Whether to install the Volume service to be boot ' 'overcloud nodes from remote volumes.')), cfg.BoolOpt('enable_legacy_ceilometer_api', - default=False, + default=True, help=('Whether to enable legacy ceilometer api ' - 'in the Undercloud.') + 'in the Undercloud. ' + 'Note: Ceilometer API has been deprecated and will be ' + 'removed in future release. Please consider moving to ' + 'gnocchi/Aodh/Panko API instead.') ), cfg.BoolOpt('ipxe_enabled', default=True, diff --git a/undercloud.conf.sample b/undercloud.conf.sample index b9f4ab6e2..5cf06ae09 100644 --- a/undercloud.conf.sample +++ b/undercloud.conf.sample @@ -163,7 +163,7 @@ # Whether to enable legacy ceilometer api service in the # Undercloud. (boolean value) -#enable_legacy_ceilometer_api = false +#enable_legacy_ceilometer_api = true # Whether to use iPXE for deploy and inspection. (boolean value) # Deprecated group/name - [DEFAULT]/ipxe_deploy