From 70b47d394d9e89310e5ec7380b205ea1f251e456 Mon Sep 17 00:00:00 2001 From: wenchma Date: Fri, 6 Mar 2015 11:57:56 +0800 Subject: [PATCH] Add ironic common package for debain platform family Add irconic-common to the ubuntu common package list in default attributes. By the way, correct connection url that is messed up . Change-Id: I658670681d4a2f7f7ad5f584b9c1c24448da7384 Closes-bug: #1428926 Closes-bug: #1429245 --- attributes/default.rb | 2 +- spec/ironic-common_spec.rb | 3 ++- templates/default/ironic.conf.erb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 620b0e1..1baa439 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -76,6 +76,6 @@ when 'debian' 'ironic_api_service' => 'ironic-api', 'ironic_conductor_packages' => ['ironic-conductor'], 'ironic_conductor_service' => 'ironic-conductor', - 'ironic_common_packages' => ['python-ironicclient'] + 'ironic_common_packages' => ['python-ironicclient', 'ironic-common'] } end diff --git a/spec/ironic-common_spec.rb b/spec/ironic-common_spec.rb index 457ad26..4fab901 100644 --- a/spec/ironic-common_spec.rb +++ b/spec/ironic-common_spec.rb @@ -28,8 +28,9 @@ describe 'openstack-bare-metal::ironic-common' do include_context 'bare-metal-stubs' - it 'upgrades ironic client packages' do + it 'upgrades ironic common packages' do expect(chef_run).to upgrade_package('python-ironicclient') + expect(chef_run).to upgrade_package('ironic-common') end it 'upgrades mysql python package' do diff --git a/templates/default/ironic.conf.erb b/templates/default/ironic.conf.erb index 21e4a3a..ff1425d 100644 --- a/templates/default/ironic.conf.erb +++ b/templates/default/ironic.conf.erb @@ -652,7 +652,7 @@ log_dir=<%= node['openstack']['bare-metal']['log_dir'] %> # Deprecated group/name - [DEFAULT]/sql_connection # Deprecated group/name - [DATABASE]/sql_connection # Deprecated group/name - [sql]/connection -connection==<%= @db_connection %> +connection=<%= @db_connection %> # The SQLAlchemy connection string to use to connect to the # slave database. (string value)