Andrew Bogott has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/377187 )
Change subject: WIP: nova: turn off hourly instance usage audits ...................................................................... WIP: nova: turn off hourly instance usage audits These were useful for keeping the 'wikistatus' pages in sync, but we don't do that anymore. We can probably live without these messages entirely, but this needs some tests on labtest before we can safely merge in production. In particular, I'm curious about whether this will break the System:Hypervisors statistics in Horizon. Change-Id: I3255975eddf2acf222bc46d3898c2d9af30f4d8a --- M modules/openstack/templates/liberty/nova/nova.conf.erb M modules/openstack/templates/mitaka/nova/nova.conf.erb M modules/openstack2/templates/liberty/nova/common/nova.conf.erb 3 files changed, 6 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/87/377187/1 diff --git a/modules/openstack/templates/liberty/nova/nova.conf.erb b/modules/openstack/templates/liberty/nova/nova.conf.erb index 89f8fb5..b9def5f 100644 --- a/modules/openstack/templates/liberty/nova/nova.conf.erb +++ b/modules/openstack/templates/liberty/nova/nova.conf.erb @@ -3,7 +3,7 @@ verbose=True auth_strategy=keystone compute_driver=nova.virt.libvirt.LibvirtDriver -notification_topics=notifications,ceilometer_notifications +notification_topics=notifications connection_type=libvirt root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf instance_name_template=i-%08x @@ -77,10 +77,7 @@ notification_driver = messagingv2 # Ceilometer things: -instance_usage_audit = True -instance_usage_audit_period = hour -notify_on_state_change = vm_and_task_state - +instance_usage_audit = False # Deprecated, remove in Kilo: diff --git a/modules/openstack/templates/mitaka/nova/nova.conf.erb b/modules/openstack/templates/mitaka/nova/nova.conf.erb index 351ee79..8f285f7 100644 --- a/modules/openstack/templates/mitaka/nova/nova.conf.erb +++ b/modules/openstack/templates/mitaka/nova/nova.conf.erb @@ -3,7 +3,7 @@ verbose=True auth_strategy=keystone compute_driver=nova.virt.libvirt.LibvirtDriver -notification_topics=notifications,ceilometer_notifications +notification_topics=notifications connection_type=libvirt root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf instance_name_template=i-%08x @@ -75,9 +75,7 @@ notification_driver = messagingv2 # Ceilometer things: -instance_usage_audit = True -instance_usage_audit_period = hour -notify_on_state_change = vm_and_task_state +instance_usage_audit = False # Deprecated, remove in Kilo: node_availability_zone=<%= @novaconfig["zone"] %> diff --git a/modules/openstack2/templates/liberty/nova/common/nova.conf.erb b/modules/openstack2/templates/liberty/nova/common/nova.conf.erb index 01b072e..7c545a6 100644 --- a/modules/openstack2/templates/liberty/nova/common/nova.conf.erb +++ b/modules/openstack2/templates/liberty/nova/common/nova.conf.erb @@ -3,7 +3,7 @@ verbose=True auth_strategy=keystone compute_driver=nova.virt.libvirt.LibvirtDriver -notification_topics=notifications,ceilometer_notifications +notification_topics=notifications connection_type=libvirt root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf instance_name_template=i-%08x @@ -77,9 +77,7 @@ notification_driver = messagingv2 # Ceilometer things: -instance_usage_audit = True -instance_usage_audit_period = hour -notify_on_state_change = vm_and_task_state +instance_usage_audit = False # When user doesn't specify a scheduling zone, use 'nova' which # has been the only zone (and, hence, the de-facto default) -- To view, visit https://gerrit.wikimedia.org/r/377187 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3255975eddf2acf222bc46d3898c2d9af30f4d8a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
