Browse Source

fix up deprecated sql_connection key

Change to use connection

Change-Id: Ic4e0db71dd4254758ec62248591d7523e1ace960
Closes-Bug: #1483402
Mark Vanderwiel 3 years ago
parent
commit
2b3a6fdf89
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      spec/spec_helper.rb
  2. 1
    1
      templates/default/heat.conf.erb

+ 1
- 1
spec/spec_helper.rb View File

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

+ 1
- 1
templates/default/heat.conf.erb View File

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

Loading…
Cancel
Save