From 2b3a6fdf89df9ed413107aa4864271bca511eeef Mon Sep 17 00:00:00 2001 From: Mark Vanderwiel Date: Mon, 10 Aug 2015 15:43:29 -0500 Subject: [PATCH] fix up deprecated sql_connection key Change to use connection Change-Id: Ic4e0db71dd4254758ec62248591d7523e1ace960 Closes-Bug: #1483402 --- spec/spec_helper.rb | 2 +- templates/default/heat.conf.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 00fda90..cbe98bd 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -305,7 +305,7 @@ shared_examples 'expects to create heat conf' do describe 'default 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_waitcondition_server_url=http://127.0.0.1:8000/v1/waitcondition$}, %r{^heat_watch_server_url=http://127.0.0.1:8003$}, diff --git a/templates/default/heat.conf.erb b/templates/default/heat.conf.erb index c36e905..083311d 100644 --- a/templates/default/heat.conf.erb +++ b/templates/default/heat.conf.erb @@ -871,7 +871,7 @@ insecure=<%= node['openstack']['orchestration']['clients_nova']['insecure'] %> # Deprecated group/name - [DEFAULT]/sql_connection # Deprecated group/name - [DATABASE]/sql_connection # Deprecated group/name - [sql]/connection -sql_connection=<%= @sql_connection %> +connection=<%= @sql_connection %> # The SQLAlchemy connection string to use to connect to the # slave database. (string value)