From 8f63ffb26e0e809e7b499288ab1d12d2659c8eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ionu=C8=9B=20Ar=C8=9B=C4=83ri=C8=99i?= Date: Tue, 1 Jul 2014 13:07:28 +0200 Subject: [PATCH] add more rabbitmq attributes Change-Id: Ibad1ff093f29217de9ee8916fe76dafc3e3b9a0b Closes-Bug: #1336231 --- recipes/conductor.rb | 5 +++-- spec/conductor-suse_spec.rb | 8 +++++++- templates/default/trove-conductor.conf.erb | 8 ++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/recipes/conductor.rb b/recipes/conductor.rb index 2a7d7c7..b7eb2cc 100644 --- a/recipes/conductor.rb +++ b/recipes/conductor.rb @@ -38,8 +38,8 @@ end db_user = node['openstack']['db']['database']['username'] db_pass = get_password 'db', 'database' db_uri = db_uri('database', db_user, db_pass).to_s -rabbit_pass = get_password( - 'user', node['openstack']['mq']['database']['rabbit']['userid']) +rabbit = node['openstack']['mq']['database']['rabbit'] +rabbit_pass = get_password('user', rabbit['userid']) identity_uri = endpoint('identity-api') template '/etc/trove/trove-conductor.conf' do @@ -50,6 +50,7 @@ template '/etc/trove/trove-conductor.conf' do variables( database_connection: db_uri, identity_uri: identity_uri, + rabbit: rabbit, rabbit_pass: rabbit_pass ) diff --git a/spec/conductor-suse_spec.rb b/spec/conductor-suse_spec.rb index b1ca613..50638ce 100644 --- a/spec/conductor-suse_spec.rb +++ b/spec/conductor-suse_spec.rb @@ -32,7 +32,13 @@ describe 'openstack-database::conductor' do [/^debug = false$/, /^verbose = false$/, %r{^sql_connection = mysql://trove:db-pass@127.0.0.1:3306/trove\?charset=utf8$}, - %r{^trove_auth_url = http://127.0.0.1:5000/v2.0$} + %r{^trove_auth_url = http://127.0.0.1:5000/v2.0$}, + /^rabbit_host = 127.0.0.1$/, + /^rabbit_virtual_host = \/$/, + /^rabbit_port = 5672$/, + /^rabbit_userid = guest$/, + /^rabbit_password = rabbit-pass$/, + /^rabbit_use_ssl = false$/ ].each do |content| expect(chef_run).to render_file(filename).with_content(content) end diff --git a/templates/default/trove-conductor.conf.erb b/templates/default/trove-conductor.conf.erb index 202f467..fbcdc6c 100644 --- a/templates/default/trove-conductor.conf.erb +++ b/templates/default/trove-conductor.conf.erb @@ -9,5 +9,13 @@ nova_proxy_admin_user = <%= node['openstack']['database']['nova_proxy_user'] %> nova_proxy_admin_pass = <%= node['openstack']['database']['nova_proxy_password'] %> nova_proxy_admin_tenant_name = <%= node['openstack']['database']['nova_proxy_tenant'] %> sql_connection = <%= @database_connection %> + +# AMQP Connection info +rabbit_host = <%= @rabbit['host'] %> +rabbit_userid = <%= @rabbit['userid'] %> rabbit_password = <%= @rabbit_pass %> +rabbit_virtual_host = <%= @rabbit['vhost'] %> +rabbit_port = <%= @rabbit['port'] %> +rabbit_use_ssl = <%= @rabbit['use_ssl'] %> + log_dir = /var/log/trove \ No newline at end of file