openstack
/
fuel-library
Code Issues Proposed changes

Fix amqp_durable_queues for ironic 

Pick value from ironic_hash if not set, set to default (False).
Set control_exchange to 'ironic'

Change-Id: I28d44f05a0ea56071cc73db9a1ae17381e93bf45
Closes-bug: #1529843
This commit is contained in:
Andrey Shestakov 2015-12-29 14:39:56 +02:00 committed by Vasyl Saienko
parent ba7ed96778
commit feb3e53eb8
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,12 +16,12 @@ $default_log_levels = hiera_hash('default_log_levels')
$use_syslog = hiera('use_syslog', true)
$syslog_log_facility_ironic = hiera('syslog_log_facility_ironic', 'LOG_USER')
$rabbit_hash = hiera_hash('rabbit_hash', {})
$rabbit_ha_queues = hiera('rabbit_ha_queues')
$amqp_hosts = hiera('amqp_hosts')
$amqp_port = hiera('amqp_port', '5673')
$rabbit_hosts = split($amqp_hosts, ',')
$neutron_config = hiera_hash('quantum_settings')
$primary_controller = hiera('primary_controller')
$amqp_durable_queues = pick($ironic_hash['amqp_durable_queues'], false)
$db_host = pick($ironic_hash['db_host'], $database_vip)
$db_user = pick($ironic_hash['db_user'], 'ironic')
@ -44,7 +44,8 @@ class { 'ironic':
rabbit_port => $amqp_port,
rabbit_userid => $rabbit_hash['user'],
rabbit_password => $rabbit_hash['password'],
amqp_durable_queues => $rabbit_ha_queues,
amqp_durable_queues => $amqp_durable_queues,
control_exchange => 'ironic',
use_syslog => $use_syslog,
log_facility => $syslog_log_facility_ironic,
database_connection => $database_connection,

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

@ -20,7 +20,7 @@ $verbose = hiera('verbose', true)
$use_syslog = hiera('use_syslog', true)
$syslog_log_facility_ironic = hiera('syslog_log_facility_ironic', 'LOG_USER')
$rabbit_hash = hiera_hash('rabbit_hash')
$rabbit_ha_queues = hiera('rabbit_ha_queues')
$amqp_durable_queues = pick($ironic_hash['amqp_durable_queues'], false)
$storage_hash = hiera('storage')
$ironic_tenant = pick($ironic_hash['tenant'],'services')
@ -52,7 +52,8 @@ class { '::ironic':
rabbit_hosts => $rabbit_hosts,
rabbit_userid => $rabbit_hash['user'],
rabbit_password => $rabbit_hash['password'],
amqp_durable_queues => $rabbit_ha_queues,
amqp_durable_queues => $amqp_durable_queues,
control_exchange => 'ironic',
use_syslog => $use_syslog,
log_facility => $syslog_log_facility_ironic,
database_connection => $database_connection,

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

@ -12,6 +12,7 @@ if ironic_enabled
default_log_levels_hash = Noop.hiera_hash 'default_log_levels'
default_log_levels = Noop.puppet_function 'join_keys_to_values',default_log_levels_hash,'='
primary_controller = Noop.hiera 'primary_controller'
amqp_durable_queues = Noop.hiera_structure 'ironic/amqp_durable_queues', 'false'
it 'should configure default_log_levels' do
should contain_ironic_config('DEFAULT/default_log_levels').with_value(default_log_levels.sort.join(','))
@ -19,9 +20,11 @@ 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,
'rabbit_userid' => rabbit_user,
'rabbit_password' => rabbit_password,
'sync_db' => primary_controller,
'control_exchange' => 'ironic',
'amqp_durable_queues' => amqp_durable_queues,
)
end

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

@ -8,6 +8,7 @@ describe manifest do
rabbit_password = Noop.hiera_structure 'rabbit/password'
ironic_enabled = Noop.hiera_structure 'ironic/enabled'
storage_config = Noop.hiera_structure 'storage'
amqp_durable_queues = Noop.hiera_structure 'ironic/amqp_durable_queues', 'false'
if ironic_enabled
it 'should ensure that ironic-fa-deploy is installed' do
@ -16,9 +17,11 @@ 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'],
'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,
)
end