From cff330053d11620bccea3bb2216c1a787767a3b5 Mon Sep 17 00:00:00 2001 From: Clayton O'Neill Date: Wed, 2 Dec 2015 21:52:44 -0500 Subject: [PATCH] Only require netaddr when needed Not all functions of the nova_floating provider require the netaddr gem. If this gets autoloaded for dependencies or otherwise, then the netaddr gem is required even if the provider isn't instantiated. Change-Id: Ic25dece3d4e7574dcac45e3f0e146dcea66ce2e7 --- lib/puppet/provider/nova_floating/nova_manage.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/puppet/provider/nova_floating/nova_manage.rb b/lib/puppet/provider/nova_floating/nova_manage.rb index 37a4a6257..53da6b775 100644 --- a/lib/puppet/provider/nova_floating/nova_manage.rb +++ b/lib/puppet/provider/nova_floating/nova_manage.rb @@ -1,5 +1,3 @@ -require 'netaddr' - Puppet::Type.type(:nova_floating).provide(:nova_manage) do desc "Manage nova floating" @@ -48,6 +46,7 @@ Puppet::Type.type(:nova_floating).provide(:nova_manage) do # Create range in cidr, including first and last ip # Nova will create this range, excluding network and broadcast IPs def mixed_range + require 'netaddr' range = [] NetAddr.merge(operate_range).each do |cidr| tmp_range = NetAddr::CIDR.create(cidr).enumerate @@ -74,6 +73,7 @@ Puppet::Type.type(:nova_floating).provide(:nova_manage) do end def ip_range + require 'netaddr' ip_range = [] Array(@resource[:network]).each do |rng| ip = rng.split('-')