diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template index 285c8eb20..01bca6b9a 100644 --- a/elements/puppet-stack-config/puppet-stack-config.yaml.template +++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template @@ -279,7 +279,6 @@ ceilometer::keystone::authtoken::auth_uri: "%{hiera('keystone_auth_uri')}" ceilometer::keystone::authtoken::auth_url: "%{hiera('keystone_identity_uri')}" ceilometer::db::database_connection: mysql+pymysql://ceilometer:{{UNDERCLOUD_CEILOMETER_PASSWORD}}@{{LOCAL_IP}}/ceilometer ceilometer::agent::auth::auth_password: {{UNDERCLOUD_CEILOMETER_PASSWORD}} -ceilometer::agent::notification::store_events: {{STORE_EVENTS}} ceilometer_compute_agent: '' snmpd_readonly_user_name: {{UNDERCLOUD_CEILOMETER_SNMPD_USER}} snmpd_readonly_user_password: {{UNDERCLOUD_CEILOMETER_SNMPD_PASSWORD}} diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py index 67cf438be..5d4f78d95 100644 --- a/instack_undercloud/undercloud.py +++ b/instack_undercloud/undercloud.py @@ -329,10 +329,6 @@ _opts = [ help=('Whether to use iPXE for deploy and inspection.'), deprecated_name='ipxe_deploy', ), - cfg.BoolOpt('store_events', - default=False, - help=('Whether to store events in the Undercloud Ceilometer.') - ), cfg.IntOpt('scheduler_max_attempts', default=30, min=1, help=('Maximum number of attempts the scheduler will make ' diff --git a/undercloud.conf.sample b/undercloud.conf.sample index 432cd6e63..3903f9ff4 100644 --- a/undercloud.conf.sample +++ b/undercloud.conf.sample @@ -179,10 +179,6 @@ # Deprecated group/name - [DEFAULT]/ipxe_deploy #ipxe_enabled = true -# Whether to store events in the Undercloud Ceilometer. (boolean -# value) -#store_events = false - # Maximum number of attempts the scheduler will make when deploying # the instance. You should keep it greater or equal to the number of # bare metal nodes you expect to deploy at once to work around