openstack
/
cookbook-openstack-database
Code Issues Proposed changes

Merge "add verbose/debug attributes to -conductor.conf"

This commit is contained in:
Jenkins 2014-07-21 09:36:38 +00:00 committed by Gerrit Code Review
parent 404980a1db eb7cb896ab
commit 245ec2c94f
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spec/conductor-suse_spec.rb
View File

@ -29,7 +29,9 @@ describe 'openstack-database::conductor' do
end
it 'has the default values for configurable attributes' do
[%r{^sql_connection = mysql://trove:db-pass@127.0.0.1:3306/trove\?charset=utf8$},
[/^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$}
].each do |content|
expect(chef_run).to render_file(filename).with_content(content)

2
templates/default/trove-conductor.conf.erb
View File

@ -1,6 +1,8 @@
<%= node["openstack"]["database"]["custom_template_banner"] %>
[DEFAULT]
verbose = <%= node["openstack"]["database"]["verbose"] %>
debug = <%= node["openstack"]["database"]["debug"] %>
control_exchange = trove
trove_auth_url = <%= @identity_uri %>
nova_proxy_admin_user = <%= node['openstack']['database']['nova_proxy_user'] %>