Merge "Centralize arbitrary configurations for libvirt daemons"
This commit is contained in:
commit
9e90c50e0b
|
@ -17,14 +17,23 @@
|
||||||
# bar:
|
# bar:
|
||||||
# value: barValue
|
# value: barValue
|
||||||
#
|
#
|
||||||
|
# [*virtlogd_config*]
|
||||||
|
# (optional) Allow configuration of arbitrary virtlogd configurations.
|
||||||
|
# The value is an hash of virtlogd_config resources.
|
||||||
|
#
|
||||||
# NOTE: The configuration MUST NOT be already handled by this module
|
# NOTE: The configuration MUST NOT be already handled by this module
|
||||||
# or Puppet catalog compilation will fail with duplicate resources.
|
# or Puppet catalog compilation will fail with duplicate resources.
|
||||||
#
|
#
|
||||||
class nova::compute::libvirt::config (
|
class nova::compute::libvirt::config (
|
||||||
$libvirtd_config = {},
|
$libvirtd_config = {},
|
||||||
|
$virtlogd_config = {},
|
||||||
) {
|
) {
|
||||||
|
|
||||||
|
include nova::deps
|
||||||
|
|
||||||
validate_legacy(Hash, 'validate_hash', $libvirtd_config)
|
validate_legacy(Hash, 'validate_hash', $libvirtd_config)
|
||||||
|
validate_legacy(Hash, 'validate_hash', $virtlogd_config)
|
||||||
|
|
||||||
create_resources('libvirtd_config', $libvirtd_config)
|
create_resources('libvirtd_config', $libvirtd_config)
|
||||||
|
create_resources('virtlogd_config', $virtlogd_config)
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
# == Class: nova::compute::libvirt::virtlogd::config
|
# == Class: nova::compute::libvirt::virtlogd::config
|
||||||
#
|
#
|
||||||
|
# DEPRECATED !
|
||||||
# This class is used to manage arbitrary virtlogd configurations.
|
# This class is used to manage arbitrary virtlogd configurations.
|
||||||
#
|
#
|
||||||
# === Parameters
|
# === Parameters
|
||||||
#
|
#
|
||||||
# [*virtlogd_config*]
|
# [*virtlogd_config*]
|
||||||
# (optional) Allow configuration of arbitrary libvirtd configurations.
|
# (optional) Allow configuration of arbitrary virtlogd configurations.
|
||||||
# The value is an hash of virtlogd_config resources. Example:
|
# The value is an hash of virtlogd_config resources. Example:
|
||||||
# { 'foo' => { value => 'fooValue'},
|
# { 'foo' => { value => 'fooValue'},
|
||||||
# 'bar' => { value => 'barValue'}
|
# 'bar' => { value => 'barValue'}
|
||||||
|
@ -24,6 +25,9 @@ class nova::compute::libvirt::virtlogd::config (
|
||||||
$virtlogd_config = {},
|
$virtlogd_config = {},
|
||||||
) {
|
) {
|
||||||
|
|
||||||
|
warning('The nova::compute::libvirt::virtlogd::config class has been deprecated. \
|
||||||
|
Use the nova::compute::libvirt::config::virtlogd_config parameter.')
|
||||||
|
|
||||||
validate_legacy(Hash, 'validate_hash', $virtlogd_config)
|
validate_legacy(Hash, 'validate_hash', $virtlogd_config)
|
||||||
|
|
||||||
create_resources('virtlogd_config', $virtlogd_config)
|
create_resources('virtlogd_config', $virtlogd_config)
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The new ``nova::compute::libvirt::virtlogd_config`` parameter has been
|
||||||
|
added.
|
||||||
|
|
||||||
|
deprecations:
|
||||||
|
- |
|
||||||
|
The ``nova::compute::libvirt::virtlogd::config`` class has been deprecated
|
||||||
|
in favor of ``nova::compute::libvirt::virtlogd_config``.
|
Loading…
Reference in New Issue