openstack
/
puppet-nova
Code Issues Proposed changes

Remove pick() for default_floating_pool 

The nova::api::default_floating_pool option is removed
but the pick in nova::network::neutron was not removed
which causes a warning.

Change-Id: Iaf3711030166a25bd3a5d6c27003ecd271be115a
This commit is contained in:
Tobias Urdin 2018-09-23 15:40:16 +02:00
parent 8a8f5ad65e
commit c203ae2ede
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/network/neutron.pp
View File

@ -108,15 +108,12 @@ class nova::network::neutron (
include ::nova::deps
$default_floating_pool_real = pick($::nova::api::default_floating_pool, $default_floating_pool)
nova_config {
'DEFAULT/dhcp_domain': value => $dhcp_domain;
'DEFAULT/firewall_driver': value => $firewall_driver;
'DEFAULT/vif_plugging_is_fatal': value => $vif_plugging_is_fatal;
'DEFAULT/vif_plugging_timeout': value => $vif_plugging_timeout;
'neutron/default_floating_pool': value => $default_floating_pool_real;
'neutron/default_floating_pool': value => $default_floating_pool;
'neutron/url': value => $neutron_url;
'neutron/timeout': value => $neutron_url_timeout;
'neutron/project_name': value => $neutron_project_name;