openstack
/
fuel-library
Code Issues Proposed changes

[sync/mitaka] Get "verbose" key safely for ironic conductor 

* use get("verbose") func in task yaql expr
* deprecate this option since it has been done
  in oslo.log already

Change-Id: I59ada13003f5239352df4394788b6e5b8789fd53
Related-Bug: #1582727
This commit is contained in:
Michael Polenchuk 2016-05-17 15:03:36 +03:00 committed by Dmitry Ilyin
parent d0d976e80d
commit 15ba6adbea
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/openstack_tasks/examples/roles/tasks.yaml
View File

@ -160,7 +160,7 @@
$.network_metadata.nodes.values().where(
$.node_roles.any($.matches('(controller|rabbitmq)'))).network_roles.select(
$.get('mgmt/messaging')),
$.get('amqp_hosts'), $.debug, $.get('use_syslog'),
$.get('amqp_hosts'), $.debug, $.get('verbose'), $.get('use_syslog'),
$.get('syslog_log_facility_ironic'), $.rabbit, $.storage,
$.get('kombu_compression'))
cross-depends:

5
deployment/puppet/openstack_tasks/manifests/roles/ironic_conductor.pp
View File

@ -18,6 +18,7 @@ class openstack_tasks::roles::ironic_conductor {
$amqp_hosts = hiera('amqp_hosts')
$rabbit_hosts = split($amqp_hosts, ',')
$debug = hiera('debug', false)
$verbose = hiera('verbose', undef)
$use_syslog = hiera('use_syslog', true)
$syslog_log_facility_ironic = hiera('syslog_log_facility_ironic', 'LOG_USER')
$rabbit_hash = hiera_hash('rabbit')
@ -74,6 +75,10 @@ class openstack_tasks::roles::ironic_conductor {
ensure => 'present',
}
if $verbose {
warning('The $verbose is deprecated and will be removed in a future release')
}
class { '::ironic':
debug => $debug,
enabled_drivers => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'],