openstack/fuel-library
Code Issues Proposed changes

Merge "Fix database_max_retries for Ironic services"

Browse Source
This commit is contained in:
Jenkins 2016-01-20 15:06:08 +00:00 committed by Gerrit Code Review
commit 010c4759ee
4 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
deployment/puppet/osnailyfacter/modular/ironic/ironic.pp
View File

@ -38,19 +38,20 @@ prepare_network_config(hiera_hash('network_scheme', {}))
$baremetal_vip = $network_metadata['vips']['baremetal']['ipaddr']
class { 'ironic':
verbose => $verbose,
debug => $debug,
rabbit_hosts => $rabbit_hosts,
rabbit_port => $amqp_port,
rabbit_userid => $rabbit_hash['user'],
rabbit_password => $rabbit_hash['password'],
amqp_durable_queues => $amqp_durable_queues,
control_exchange => 'ironic',
use_syslog => $use_syslog,
log_facility => $syslog_log_facility_ironic,
database_connection => $database_connection,
glance_api_servers => $glance_api_servers,
sync_db => $primary_controller,
verbose => $verbose,
debug => $debug,
rabbit_hosts => $rabbit_hosts,
rabbit_port => $amqp_port,
rabbit_userid => $rabbit_hash['user'],
rabbit_password => $rabbit_hash['password'],
amqp_durable_queues => $amqp_durable_queues,
control_exchange => 'ironic',
use_syslog => $use_syslog,
log_facility => $syslog_log_facility_ironic,
database_connection => $database_connection,
database_max_retries => '-1',
glance_api_servers => $glance_api_servers,
sync_db => $primary_controller,
}
# TODO (iberezovskiy): Move to globals (as it is done for sahara)

25
deployment/puppet/osnailyfacter/modular/roles/ironic-conductor.pp
View File

@ -47,18 +47,19 @@ package { 'ironic-fa-deploy':
}
class { '::ironic':
verbose => $verbose,
debug => $debug,
enabled_drivers => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'],
rabbit_hosts => $rabbit_hosts,
rabbit_userid => $rabbit_hash['user'],
rabbit_password => $rabbit_hash['password'],
amqp_durable_queues => $amqp_durable_queues,
control_exchange => 'ironic',
use_syslog => $use_syslog,
log_facility => $syslog_log_facility_ironic,
database_connection => $database_connection,
glance_api_servers => $glance_api_servers,
verbose => $verbose,
debug => $debug,
enabled_drivers => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'],
rabbit_hosts => $rabbit_hosts,
rabbit_userid => $rabbit_hash['user'],
rabbit_password => $rabbit_hash['password'],
amqp_durable_queues => $amqp_durable_queues,
control_exchange => 'ironic',
use_syslog => $use_syslog,
log_facility => $syslog_log_facility_ironic,
database_connection => $database_connection,
database_max_retries => '-1',
glance_api_servers => $glance_api_servers,
}
class { '::ironic::client': }

11
tests/noop/spec/hosts/ironic/ironic_spec.rb
View File

@ -20,11 +20,12 @@ if ironic_enabled
it 'should declare ironic class correctly' do
should contain_class('ironic').with(
'rabbit_userid' => rabbit_user,
'rabbit_password' => rabbit_password,
'sync_db' => primary_controller,
'control_exchange' => 'ironic',
'amqp_durable_queues' => amqp_durable_queues,
'rabbit_userid' => rabbit_user,
'rabbit_password' => rabbit_password,
'sync_db' => primary_controller,
'control_exchange' => 'ironic',
'amqp_durable_queues' => amqp_durable_queues,
'database_max_retries' => '-1',
)
end

11
tests/noop/spec/hosts/roles/ironic-conductor_spec.rb
View File

@ -17,11 +17,12 @@ describe manifest do
it 'should declare ironic class correctly' do
should contain_class('ironic').with(
'rabbit_userid' => rabbit_user,
'rabbit_password' => rabbit_password,
'enabled_drivers' => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'],
'control_exchange' => 'ironic',
'amqp_durable_queues' => amqp_durable_queues,
'rabbit_userid' => rabbit_user,
'rabbit_password' => rabbit_password,
'enabled_drivers' => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'],
'control_exchange' => 'ironic',
'amqp_durable_queues' => amqp_durable_queues,
'database_max_retries' => '-1',
)
end