From ee190da9e9fb37cfa409ccff29541ebb04a02cea Mon Sep 17 00:00:00 2001 From: wenchma Date: Wed, 3 Jun 2015 10:16:39 +0800 Subject: [PATCH] Update the deprecated group/name to Kilo release For Kilo release, there are many deprecated group/name in conf files of openstack, so we need to change the deprecated group/name to new group/name. blueprint conf-section-update-for-kilo Closes-bug: #1436170 Change-Id: Icf361d2132553bbc20b517c8b08f6df2d069e8bb --- spec/common_spec.rb | 35 +++++---- templates/default/ceilometer.conf.erb | 106 ++++++++++++++++---------- 2 files changed, 85 insertions(+), 56 deletions(-) diff --git a/spec/common_spec.rb b/spec/common_spec.rb index 4f04768..c63f66b 100644 --- a/spec/common_spec.rb +++ b/spec/common_spec.rb @@ -87,18 +87,18 @@ describe 'openstack-telemetry::common' do /^sample_source = RegionOne$/) end - it 'has default RPC/AMQP options set' do - [/^amqp_durable_queues=false$/, - /^amqp_auto_delete=false$/].each do |line| - expect(chef_run).to render_file(file.name).with_content(line) - end - end - context 'rabbit mq backend' do before do node.set['openstack']['mq']['telemetry']['service_type'] = 'rabbitmq' end + it 'has default RPC/AMQP options set' do + [/^amqp_durable_queues=false$/, + /^amqp_auto_delete=false$/].each do |line| + expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', line) + end + end + describe 'ha rabbit disabled' do before do node.override['openstack']['mq']['telemetry']['rabbit']['ha'] = false @@ -113,14 +113,14 @@ describe 'openstack-telemetry::common' do /^rabbit_virtual_host = \/$/, /^rabbit_use_ssl = false$/ ].each do |line| - expect(chef_run).to render_file(file.name).with_content(line) + expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', line) end end it 'does not have ha rabbit options set' do [/^rabbit_hosts = /, /^rabbit_ha_queues = /].each do |line| - expect(chef_run).not_to render_file(file.name).with_content(line) + expect(chef_run).not_to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', line) end end end @@ -139,27 +139,27 @@ describe 'openstack-telemetry::common' do /^rabbit_virtual_host = \/$/, /^rabbit_use_ssl = false$/ ].each do |line| - expect(chef_run).to render_file(file.name).with_content(line) + expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', line) end end it 'does not have non-ha rabbit options set' do [/^rabbit_host = /, /^rabbit_port = /].each do |line| - expect(chef_run).not_to render_file(file.name).with_content(line) + expect(chef_run).not_to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', line) end end end it 'does not have kombu ssl version set' do - expect(chef_run).not_to render_config_file(file.name).with_section_content('DEFAULT', /^kombu_ssl_version=TLSv1.2$/) + expect(chef_run).not_to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^kombu_ssl_version=TLSv1.2$/) end it 'sets kombu ssl version' do node.set['openstack']['mq']['telemetry']['rabbit']['use_ssl'] = true node.set['openstack']['mq']['telemetry']['rabbit']['kombu_ssl_version'] = 'TLSv1.2' - expect(chef_run).to render_config_file(file.name).with_section_content('DEFAULT', /^kombu_ssl_version=TLSv1.2$/) + expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^kombu_ssl_version=TLSv1.2$/) end end @@ -169,6 +169,13 @@ describe 'openstack-telemetry::common' do node.set['openstack']['mq']['telemetry']['qpid']['username'] = 'guest' end + it 'has default RPC/AMQP options set' do + [/^amqp_durable_queues=false$/, + /^amqp_auto_delete=false$/].each do |line| + expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_qpid', line) + end + end + it 'has default qpid_* options set' do [ /^qpid_hostname=127.0.0.1$/, @@ -188,7 +195,7 @@ describe 'openstack-telemetry::common' do /^qpid_tcp_nodelay=true$/, /^qpid_topology_version=1$/ ].each do |line| - expect(chef_run).to render_file(file.name).with_content(line) + expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_qpid', line) end end end diff --git a/templates/default/ceilometer.conf.erb b/templates/default/ceilometer.conf.erb index fd4e5a8..8502cbf 100644 --- a/templates/default/ceilometer.conf.erb +++ b/templates/default/ceilometer.conf.erb @@ -16,48 +16,6 @@ sample_source = <%= node["openstack"]["telemetry"]["sample_source"] %> ##### AMQP ##### notification_topics = notifications,glance_notifications -amqp_durable_queues=<%= node["openstack"]["mq"]["telemetry"]["durable_queues"] %> -amqp_auto_delete=<%= node["openstack"]["mq"]["telemetry"]["auto_delete"] %> - -<% if @mq_service_type == "rabbitmq" %> -<% if node["openstack"]["mq"]["telemetry"]["rabbit"]["use_ssl"] && node["openstack"]["mq"]["telemetry"]["rabbit"]["kombu_ssl_version"] %> -kombu_ssl_version=<%= node["openstack"]["mq"]["telemetry"]["rabbit"]["kombu_ssl_version"] %> -<% end -%> -##### RABBITMQ ##### -rabbit_userid = <%= node["openstack"]["mq"]["telemetry"]["rabbit"]["userid"] %> -rabbit_password = <%= @mq_password %> -<% if node["openstack"]["mq"]["telemetry"]["rabbit"]["ha"] %> -rabbit_hosts = <%= @rabbit_hosts %> -rabbit_ha_queues = True -<% else %> -rabbit_port = <%= node["openstack"]["mq"]["telemetry"]["rabbit"]["port"] %> -rabbit_host = <%= node["openstack"]["mq"]["telemetry"]["rabbit"]["host"] %> -<% end %> -rabbit_virtual_host = <%= node["openstack"]["mq"]["telemetry"]["rabbit"]["vhost"] %> -rabbit_use_ssl = <%= node["openstack"]["mq"]["telemetry"]["rabbit"]["use_ssl"] %> -rpc_backend = ceilometer.openstack.common.rpc.impl_kombu -<% end %> - -<% if @mq_service_type == "qpid" %> -##### QPID ##### -rpc_backend=ceilometer.openstack.common.rpc.impl_qpid -qpid_hostname=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["host"] %> -qpid_port=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["port"] %> -qpid_password=<%= @mq_password %> -qpid_username=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["username"] %> -qpid_sasl_mechanisms=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["sasl_mechanisms"] %> -qpid_reconnect=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["reconnect"] %> -qpid_reconnect_timeout=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["reconnect_timeout"] %> -qpid_reconnect_limit=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["reconnect_limit"] %> -qpid_reconnect_interval_min=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["reconnect_interval_min"] %> -qpid_reconnect_interval_max=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["reconnect_interval_max"] %> -qpid_reconnect_interval=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["reconnect_interval"] %> -qpid_heartbeat=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["heartbeat"] %> -# qpid protocol. default 'tcp'. set to 'ssl' to enable SSL -qpid_protocol=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["protocol"] %> -qpid_tcp_nodelay=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["tcp_nodelay"] %> -qpid_topology_version=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["topology_version"] %> -<% end %> glance_registry_host = <%= @image_endpoint.host %> periodic_interval = <%= node["openstack"]["telemetry"]["periodic_interval"] %> @@ -107,6 +65,70 @@ cafile = <%= node['openstack']['telemetry']['api']['auth']['cafile'] %> # Verify HTTPS connections. (boolean value) insecure = <%= node['openstack']['telemetry']['api']['auth']['insecure'] %> +<% if @mq_service_type == "qpid" %> +[oslo_messaging_qpid] + +# +# From oslo.messaging +# + +# Use durable queues in AMQP. (boolean value) +amqp_durable_queues=<%= node["openstack"]["mq"]["telemetry"]["durable_queues"] %> + +# Auto-delete queues in AMQP. (boolean value) +amqp_auto_delete=<%= node["openstack"]["mq"]["telemetry"]["auto_delete"] %> + +##### QPID ##### +rpc_backend=ceilometer.openstack.common.rpc.impl_qpid +qpid_hostname=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["host"] %> +qpid_port=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["port"] %> +qpid_password=<%= @mq_password %> +qpid_username=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["username"] %> +qpid_sasl_mechanisms=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["sasl_mechanisms"] %> +qpid_reconnect=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["reconnect"] %> +qpid_reconnect_timeout=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["reconnect_timeout"] %> +qpid_reconnect_limit=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["reconnect_limit"] %> +qpid_reconnect_interval_min=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["reconnect_interval_min"] %> +qpid_reconnect_interval_max=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["reconnect_interval_max"] %> +qpid_reconnect_interval=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["reconnect_interval"] %> +qpid_heartbeat=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["heartbeat"] %> +# qpid protocol. default 'tcp'. set to 'ssl' to enable SSL +qpid_protocol=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["protocol"] %> +qpid_tcp_nodelay=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["tcp_nodelay"] %> +qpid_topology_version=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["topology_version"] %> +<% end %> + +<% if @mq_service_type == "rabbitmq" %> +[oslo_messaging_rabbit] + +# +# From oslo.messaging +# + +# Use durable queues in AMQP. (boolean value) +amqp_durable_queues=<%= node["openstack"]["mq"]["telemetry"]["durable_queues"] %> + +# Auto-delete queues in AMQP. (boolean value) +amqp_auto_delete=<%= node["openstack"]["mq"]["telemetry"]["auto_delete"] %> + +<% if node["openstack"]["mq"]["telemetry"]["rabbit"]["use_ssl"] && node["openstack"]["mq"]["telemetry"]["rabbit"]["kombu_ssl_version"] %> +kombu_ssl_version=<%= node["openstack"]["mq"]["telemetry"]["rabbit"]["kombu_ssl_version"] %> +<% end -%> +##### RABBITMQ ##### +rabbit_userid = <%= node["openstack"]["mq"]["telemetry"]["rabbit"]["userid"] %> +rabbit_password = <%= @mq_password %> +<% if node["openstack"]["mq"]["telemetry"]["rabbit"]["ha"] %> +rabbit_hosts = <%= @rabbit_hosts %> +rabbit_ha_queues = True +<% else %> +rabbit_port = <%= node["openstack"]["mq"]["telemetry"]["rabbit"]["port"] %> +rabbit_host = <%= node["openstack"]["mq"]["telemetry"]["rabbit"]["host"] %> +<% end %> +rabbit_virtual_host = <%= node["openstack"]["mq"]["telemetry"]["rabbit"]["vhost"] %> +rabbit_use_ssl = <%= node["openstack"]["mq"]["telemetry"]["rabbit"]["use_ssl"] %> +rpc_backend = ceilometer.openstack.common.rpc.impl_kombu +<% end %> + [publisher_rpc] metering_secret = <%= @metering_secret %>