openstack
/
cookbook-openstack-bare-metal
Code Issues Proposed changes

Merge "Add ironic common package for debain platform family"

This commit is contained in:
Jenkins 2015-03-10 20:10:33 +00:00 committed by Gerrit Code Review
parent 673627d9e5 70b47d394d
commit fca6396aca
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
attributes/default.rb
View File

@ -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

3
spec/ironic-common_spec.rb
View File

@ -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

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

@ -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)