Merge "Add ironic common package for debain platform family"
This commit is contained in:
commit
fca6396aca
|
@ -76,6 +76,6 @@ when 'debian'
|
||||||
'ironic_api_service' => 'ironic-api',
|
'ironic_api_service' => 'ironic-api',
|
||||||
'ironic_conductor_packages' => ['ironic-conductor'],
|
'ironic_conductor_packages' => ['ironic-conductor'],
|
||||||
'ironic_conductor_service' => 'ironic-conductor',
|
'ironic_conductor_service' => 'ironic-conductor',
|
||||||
'ironic_common_packages' => ['python-ironicclient']
|
'ironic_common_packages' => ['python-ironicclient', 'ironic-common']
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
|
@ -28,8 +28,9 @@ describe 'openstack-bare-metal::ironic-common' do
|
||||||
|
|
||||||
include_context 'bare-metal-stubs'
|
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('python-ironicclient')
|
||||||
|
expect(chef_run).to upgrade_package('ironic-common')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'upgrades mysql python package' do
|
it 'upgrades mysql python package' do
|
||||||
|
|
|
@ -652,7 +652,7 @@ log_dir=<%= node['openstack']['bare-metal']['log_dir'] %>
|
||||||
# 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
|
||||||
connection==<%= @db_connection %>
|
connection=<%= @db_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)
|
||||||
|
|
Loading…
Reference in New Issue