openstack
/
cookbook-openstack-orchestration
Code Issues Proposed changes

fix up deprecated sql_connection key 

Change to use connection

Change-Id: Ic4e0db71dd4254758ec62248591d7523e1ace960
Closes-Bug: #1483402
This commit is contained in:
Mark Vanderwiel 2015-08-10 15:43:29 -05:00
parent 0170665c67
commit 2b3a6fdf89
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spec/spec_helper.rb
View File

@ -305,7 +305,7 @@ shared_examples 'expects to create heat conf' do
describe 'default values' do describe 'default values' do
it 'has default conf values' do it 'has default conf values' do
[ [
%r{^sql_connection=mysql://heat:heat@127.0.0.1:3306/heat\?charset=utf8$}, %r{^connection=mysql://heat:heat@127.0.0.1:3306/heat\?charset=utf8$},
%r{^heat_metadata_server_url=http://127.0.0.1:8000$}, %r{^heat_metadata_server_url=http://127.0.0.1:8000$},
%r{^heat_waitcondition_server_url=http://127.0.0.1:8000/v1/waitcondition$}, %r{^heat_waitcondition_server_url=http://127.0.0.1:8000/v1/waitcondition$},
%r{^heat_watch_server_url=http://127.0.0.1:8003$}, %r{^heat_watch_server_url=http://127.0.0.1:8003$},

2
templates/default/heat.conf.erb
View File

@ -871,7 +871,7 @@ insecure=<%= node['openstack']['orchestration']['clients_nova']['insecure'] %>
# Deprecated group/name - [DEFAULT]/sql_connection # Deprecated group/name - [DEFAULT]/sql_connection
# Deprecated group/name - [DATABASE]/sql_connection # Deprecated group/name - [DATABASE]/sql_connection
# Deprecated group/name - [sql]/connection # Deprecated group/name - [sql]/connection
sql_connection=<%= @sql_connection %> connection=<%= @sql_connection %>
# The SQLAlchemy connection string to use to connect to the # The SQLAlchemy connection string to use to connect to the
# slave database. (string value) # slave database. (string value)