openstack
/
cookbook-openstack-telemetry
Code Issues Proposed changes

Clean up cookbook for bp/clean-up-attr-for-mq-and-db 

This change removes the attributes we'll be moving to openstack-common
and changes reference of those attributes to reflect new (more
consistent) namespace.

Change-Id: I30e37b4ff6369c19978973a8890ef2122692db44
Implements: blueprint clean-up-attr-for-mq-and-db
This commit is contained in:
Matt Thompson 2014-01-16 15:53:24 +00:00
parent 387fce5f9e
commit 34e8b38de6
4 changed files with 27 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
attributes/default.rb
View File

@ -23,38 +23,8 @@
# that Nova uses
default['openstack']['metering']['rabbit_server_chef_role'] = 'os-ops-messaging'
# This user's password is stored in an encrypted databag
# and accessed with openstack-common cookbook library's
# get_password routine. You are expected to create
# the user, pass, vhost in a wrapper rabbitmq cookbook.
default['openstack']['metering']['rabbit']['username'] = 'guest'
default['openstack']['metering']['rabbit']['vhost'] = '/'
default['openstack']['metering']['rabbit']['port'] = 5672
default['openstack']['metering']['rabbit']['host'] = '127.0.0.1'
default['openstack']['metering']['rabbit']['ha'] = false
# MQ options
default['openstack']['metering']['mq']['service_type'] = node['openstack']['mq']['service_type']
default['openstack']['metering']['mq']['qpid']['host'] = '127.0.0.1'
default['openstack']['metering']['mq']['qpid']['port'] = '5672'
default['openstack']['metering']['mq']['qpid']['qpid_hosts'] = ['127.0.0.1:5672']
default['openstack']['metering']['mq']['qpid']['username'] = ''
default['openstack']['metering']['mq']['qpid']['password'] = ''
default['openstack']['metering']['mq']['qpid']['sasl_mechanisms'] = ''
default['openstack']['metering']['mq']['qpid']['reconnect'] = true
default['openstack']['metering']['mq']['qpid']['reconnect_timeout'] = 0
default['openstack']['metering']['mq']['qpid']['reconnect_limit'] = 0
default['openstack']['metering']['mq']['qpid']['reconnect_interval_min'] = 0
default['openstack']['metering']['mq']['qpid']['reconnect_interval_max'] = 0
default['openstack']['metering']['mq']['qpid']['reconnect_interval'] = 0
default['openstack']['metering']['mq']['qpid']['heartbeat'] = 60
default['openstack']['metering']['mq']['qpid']['protocol'] = 'tcp'
default['openstack']['metering']['mq']['qpid']['tcp_nodelay'] = true
default['openstack']['metering']['conf_dir'] = '/etc/ceilometer'
default['openstack']['metering']['conf'] = ::File.join(node['openstack']['metering']['conf_dir'], 'ceilometer.conf')
default['openstack']['metering']['db']['username'] = 'ceilometer'
default['openstack']['metering']['periodic_interval'] = 600
default['openstack']['metering']['syslog']['use'] = false

6
recipes/common.rb
View File

@ -33,11 +33,11 @@ platform['common_packages'].each do |pkg|
package pkg
end
if node['openstack']['metering']['mq']['service_type'] == 'rabbitmq'
rabbit_pass = get_password 'user', node['openstack']['metering']['rabbit']['username']
if node['openstack']['mq']['metering']['service_type'] == 'rabbitmq'
rabbit_pass = get_password 'user', node['openstack']['mq']['metering']['rabbit']['userid']
end
db_user = node['openstack']['metering']['db']['username']
db_user = node['openstack']['db']['metering']['username']
db_pass = get_password 'db', 'ceilometer'
db_uri = db_uri('metering', db_user, db_pass).to_s

4
spec/common_spec.rb
View File

@ -46,6 +46,7 @@ describe 'openstack-metering::common' do
/^rabbit_port = 5672$/,
/^rabbit_host = 127.0.0.1$/,
/^rabbit_virtual_host = \/$/,
/^rabbit_use_ssl = false$/,
%r{^auth_uri = http://127.0.0.1:5000/v2.0$},
/^auth_host = 127.0.0.1$/,
/^auth_port = 35357$/,
@ -59,7 +60,8 @@ describe 'openstack-metering::common' do
context 'with qpid enabled' do
before do
@chef_run.node.set['openstack']['metering']['mq']['service_type'] = 'qpid'
@chef_run.node.set['openstack']['mq']['metering']['service_type'] = 'qpid'
@chef_run.converge 'openstack-metering::common'
end
[/^qpid_hostname=127.0.0.1$/,

41
templates/default/ceilometer.conf.erb
View File

@ -11,36 +11,37 @@ database_connection = <%= @database_connection %>
verbose = True
notification_topics = notifications,glance_notifications
<% if node["openstack"]["metering"]["mq"]["service_type"] == "rabbitmq" %>
<% if node["openstack"]["mq"]["metering"]["service_type"] == "rabbitmq" %>
##### RABBITMQ #####
rabbit_userid = <%= node["openstack"]["metering"]["rabbit"]["username"] %>
rabbit_userid = <%= node["openstack"]["mq"]["metering"]["rabbit"]["userid"] %>
rabbit_password = <%= @rabbit_pass %>
rabbit_port = <%= node["openstack"]["metering"]["rabbit"]["port"] %>
rabbit_host = <%= node["openstack"]["metering"]["rabbit"]["host"] %>
rabbit_virtual_host = <%= node["openstack"]["metering"]["rabbit"]["vhost"] %>
rabbit_port = <%= node["openstack"]["mq"]["metering"]["rabbit"]["port"] %>
rabbit_host = <%= node["openstack"]["mq"]["metering"]["rabbit"]["host"] %>
rabbit_virtual_host = <%= node["openstack"]["mq"]["metering"]["rabbit"]["vhost"] %>
rabbit_use_ssl = <%= node["openstack"]["mq"]["metering"]["rabbit"]["use_ssl"] %>
rpc_backend = ceilometer.openstack.common.rpc.impl_kombu
<% end %>
<% if node["openstack"]["metering"]["mq"]["service_type"] == "qpid" %>
<% if node["openstack"]["mq"]["metering"]["service_type"] == "qpid" %>
##### QPID #####
rpc_backend=ceilometer.openstack.common.rpc.impl_qpid
qpid_hostname=<%= node["openstack"]["metering"]["mq"]["qpid"]["host"] %>
qpid_port=<%= node["openstack"]["metering"]["mq"]["qpid"]["port"] %>
qpid_hostname=<%= node["openstack"]["mq"]["metering"]["qpid"]["host"] %>
qpid_port=<%= node["openstack"]["mq"]["metering"]["qpid"]["port"] %>
qpid_password=<%= node["openstack"]["metering"]["mq"]["qpid"]["password"] %>
qpid_username=<%= node["openstack"]["metering"]["mq"]["qpid"]["username"] %>
qpid_sasl_mechanisms=<%= node["openstack"]["metering"]["mq"]["qpid"]["sasl_mechanisms"] %>
qpid_reconnect=<%= node["openstack"]["metering"]["mq"]["qpid"]["reconnect"] %>
qpid_reconnect_timeout=<%= node["openstack"]["metering"]["mq"]["qpid"]["reconnect_timeout"] %>
qpid_reconnect_limit=<%= node["openstack"]["metering"]["mq"]["qpid"]["reconnect_limit"] %>
qpid_reconnect_interval_min=<%= node["openstack"]["metering"]["mq"]["qpid"]["reconnect_interval_min"] %>
qpid_reconnect_interval_max=<%= node["openstack"]["metering"]["mq"]["qpid"]["reconnect_interval_max"] %>
qpid_reconnect_interval=<%= node["openstack"]["metering"]["mq"]["qpid"]["reconnect_interval"] %>
qpid_heartbeat=<%= node["openstack"]["metering"]["mq"]["qpid"]["heartbeat"] %>
qpid_password=<%= node["openstack"]["mq"]["metering"]["qpid"]["password"] %>
qpid_username=<%= node["openstack"]["mq"]["metering"]["qpid"]["username"] %>
qpid_sasl_mechanisms=<%= node["openstack"]["mq"]["metering"]["qpid"]["sasl_mechanisms"] %>
qpid_reconnect=<%= node["openstack"]["mq"]["metering"]["qpid"]["reconnect"] %>
qpid_reconnect_timeout=<%= node["openstack"]["mq"]["metering"]["qpid"]["reconnect_timeout"] %>
qpid_reconnect_limit=<%= node["openstack"]["mq"]["metering"]["qpid"]["reconnect_limit"] %>
qpid_reconnect_interval_min=<%= node["openstack"]["mq"]["metering"]["qpid"]["reconnect_interval_min"] %>
qpid_reconnect_interval_max=<%= node["openstack"]["mq"]["metering"]["qpid"]["reconnect_interval_max"] %>
qpid_reconnect_interval=<%= node["openstack"]["mq"]["metering"]["qpid"]["reconnect_interval"] %>
qpid_heartbeat=<%= node["openstack"]["mq"]["metering"]["qpid"]["heartbeat"] %>
# qpid protocol. default 'tcp'. set to 'ssl' to enable SSL
qpid_protocol=<%= node["openstack"]["metering"]["mq"]["qpid"]["protocol"] %>
qpid_tcp_nodelay=<%= node["openstack"]["metering"]["mq"]["qpid"]["tcp_nodelay"] %>
qpid_protocol=<%= node["openstack"]["mq"]["metering"]["qpid"]["protocol"] %>
qpid_tcp_nodelay=<%= node["openstack"]["mq"]["metering"]["qpid"]["tcp_nodelay"] %>
<% end %>