From c203ae2ede0653fb20f685692ebbc200fef8c409 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Sun, 23 Sep 2018 15:40:16 +0200 Subject: [PATCH] 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 --- manifests/network/neutron.pp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/manifests/network/neutron.pp b/manifests/network/neutron.pp index d2efbdcdb..c00042df6 100644 --- a/manifests/network/neutron.pp +++ b/manifests/network/neutron.pp @@ -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;