diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp index cc1270048..420bcd4bb 100644 --- a/elements/puppet-stack-config/puppet-stack-config.pp +++ b/elements/puppet-stack-config/puppet-stack-config.pp @@ -180,7 +180,9 @@ if str2bool(hiera('enable_telemetry', true)) { include ::ceilometer::keystone::auth include ::aodh::keystone::auth include ::ceilometer - include ::ceilometer::api + if str2bool(hiera('enable_legacy_ceilometer_api', false)) { + include ::ceilometer::api + } include ::ceilometer::wsgi::apache include ::ceilometer::db include ::ceilometer::agent::notification diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template index 86d1bbd1e..8da3b5ee5 100644 --- a/elements/puppet-stack-config/puppet-stack-config.yaml.template +++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template @@ -668,6 +668,7 @@ enable_mistral: {{ENABLE_MISTRAL}} enable_zaqar: {{ENABLE_ZAQAR}} enable_validations: {{ENABLE_VALIDATIONS}} enable_telemetry: {{ENABLE_TELEMETRY}} +enable_legacy_ceilometer_api: {{ENABLE_LEGACY_CEILOMETER_API}} enable_ui: {{ENABLE_UI}} enable_cinder: {{ENABLE_CINDER}} diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py index 63b8681f6..904153082 100644 --- a/instack_undercloud/undercloud.py +++ b/instack_undercloud/undercloud.py @@ -294,6 +294,11 @@ _opts = [ default=False, help=('Whether to install the Volume service to be boot ' 'overcloud nodes from remote volumes.')), + cfg.BoolOpt('enable_legacy_ceilometer_api', + default=False, + help=('Whether to enable legacy ceilometer api ' + 'in the Undercloud.') + ), cfg.BoolOpt('ipxe_enabled', default=True, help=('Whether to use iPXE for deploy and inspection.'), diff --git a/undercloud.conf.sample b/undercloud.conf.sample index 9c954cbfb..b9f4ab6e2 100644 --- a/undercloud.conf.sample +++ b/undercloud.conf.sample @@ -161,6 +161,10 @@ # from remote volumes. (boolean value) #enable_cinder = false +# Whether to enable legacy ceilometer api service in the +# Undercloud. (boolean value) +#enable_legacy_ceilometer_api = false + # Whether to use iPXE for deploy and inspection. (boolean value) # Deprecated group/name - [DEFAULT]/ipxe_deploy #ipxe_enabled = true