add more rabbitmq attributes
Change-Id: Ibad1ff093f29217de9ee8916fe76dafc3e3b9a0b Closes-Bug: #1336231
This commit is contained in:
parent
245ec2c94f
commit
8f63ffb26e
|
@ -38,8 +38,8 @@ end
|
||||||
db_user = node['openstack']['db']['database']['username']
|
db_user = node['openstack']['db']['database']['username']
|
||||||
db_pass = get_password 'db', 'database'
|
db_pass = get_password 'db', 'database'
|
||||||
db_uri = db_uri('database', db_user, db_pass).to_s
|
db_uri = db_uri('database', db_user, db_pass).to_s
|
||||||
rabbit_pass = get_password(
|
rabbit = node['openstack']['mq']['database']['rabbit']
|
||||||
'user', node['openstack']['mq']['database']['rabbit']['userid'])
|
rabbit_pass = get_password('user', rabbit['userid'])
|
||||||
identity_uri = endpoint('identity-api')
|
identity_uri = endpoint('identity-api')
|
||||||
|
|
||||||
template '/etc/trove/trove-conductor.conf' do
|
template '/etc/trove/trove-conductor.conf' do
|
||||||
|
@ -50,6 +50,7 @@ template '/etc/trove/trove-conductor.conf' do
|
||||||
variables(
|
variables(
|
||||||
database_connection: db_uri,
|
database_connection: db_uri,
|
||||||
identity_uri: identity_uri,
|
identity_uri: identity_uri,
|
||||||
|
rabbit: rabbit,
|
||||||
rabbit_pass: rabbit_pass
|
rabbit_pass: rabbit_pass
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,13 @@ describe 'openstack-database::conductor' do
|
||||||
[/^debug = false$/,
|
[/^debug = false$/,
|
||||||
/^verbose = false$/,
|
/^verbose = false$/,
|
||||||
%r{^sql_connection = mysql://trove:db-pass@127.0.0.1:3306/trove\?charset=utf8$},
|
%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|
|
].each do |content|
|
||||||
expect(chef_run).to render_file(filename).with_content(content)
|
expect(chef_run).to render_file(filename).with_content(content)
|
||||||
end
|
end
|
||||||
|
|
|
@ -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_pass = <%= node['openstack']['database']['nova_proxy_password'] %>
|
||||||
nova_proxy_admin_tenant_name = <%= node['openstack']['database']['nova_proxy_tenant'] %>
|
nova_proxy_admin_tenant_name = <%= node['openstack']['database']['nova_proxy_tenant'] %>
|
||||||
sql_connection = <%= @database_connection %>
|
sql_connection = <%= @database_connection %>
|
||||||
|
|
||||||
|
# AMQP Connection info
|
||||||
|
rabbit_host = <%= @rabbit['host'] %>
|
||||||
|
rabbit_userid = <%= @rabbit['userid'] %>
|
||||||
rabbit_password = <%= @rabbit_pass %>
|
rabbit_password = <%= @rabbit_pass %>
|
||||||
|
rabbit_virtual_host = <%= @rabbit['vhost'] %>
|
||||||
|
rabbit_port = <%= @rabbit['port'] %>
|
||||||
|
rabbit_use_ssl = <%= @rabbit['use_ssl'] %>
|
||||||
|
|
||||||
log_dir = /var/log/trove
|
log_dir = /var/log/trove
|
Loading…
Reference in New Issue