Merge "config: Remove deprecated plugin_nuage_config"
This commit is contained in:
commit
447ec9cbb9
|
@ -92,9 +92,6 @@
|
|||
# [*linuxbridge_agent_config*]
|
||||
# (optional) Manage configuration of linuxbridge_agent.ini
|
||||
#
|
||||
# [*plugin_nuage_config*]
|
||||
# (optional) Manage configuration of plugins/nuage/plugin.ini
|
||||
#
|
||||
# NOTE: The configuration MUST NOT be already handled by this module
|
||||
# or Puppet catalog compilation will fail with duplicate resources.
|
||||
#
|
||||
|
@ -123,7 +120,6 @@ class neutron::config (
|
|||
Hash $plugin_ml2_config = {},
|
||||
# DEPRECATED PARAMETERS
|
||||
Optional[Hash] $linuxbridge_agent_config = undef,
|
||||
Optional[Hash] $plugin_nuage_config = undef,
|
||||
) {
|
||||
|
||||
include neutron::deps
|
||||
|
@ -135,10 +131,6 @@ class neutron::config (
|
|||
$linuxbridge_agent_config_real = {}
|
||||
}
|
||||
|
||||
if $plugin_nuage_config != undef {
|
||||
warning('The plugin_nuage_config parameter is deprecated and has no effect.')
|
||||
}
|
||||
|
||||
create_resources('neutron_config', $server_config)
|
||||
create_resources('neutron_api_paste_ini', $api_paste_ini)
|
||||
create_resources('neutron_rootwrap_config', $rootwrap_config)
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
upgrade:
|
||||
- |
|
||||
The ``neutron::config::plugin_nuage_config`` parameter has been removed.
|
Loading…
Reference in New Issue