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
This commit is contained in:
parent
bd64e9274b
commit
cff330053d
|
@ -1,5 +1,3 @@
|
||||||
require 'netaddr'
|
|
||||||
|
|
||||||
Puppet::Type.type(:nova_floating).provide(:nova_manage) do
|
Puppet::Type.type(:nova_floating).provide(:nova_manage) do
|
||||||
|
|
||||||
desc "Manage nova floating"
|
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
|
# Create range in cidr, including first and last ip
|
||||||
# Nova will create this range, excluding network and broadcast IPs
|
# Nova will create this range, excluding network and broadcast IPs
|
||||||
def mixed_range
|
def mixed_range
|
||||||
|
require 'netaddr'
|
||||||
range = []
|
range = []
|
||||||
NetAddr.merge(operate_range).each do |cidr|
|
NetAddr.merge(operate_range).each do |cidr|
|
||||||
tmp_range = NetAddr::CIDR.create(cidr).enumerate
|
tmp_range = NetAddr::CIDR.create(cidr).enumerate
|
||||||
|
@ -74,6 +73,7 @@ Puppet::Type.type(:nova_floating).provide(:nova_manage) do
|
||||||
end
|
end
|
||||||
|
|
||||||
def ip_range
|
def ip_range
|
||||||
|
require 'netaddr'
|
||||||
ip_range = []
|
ip_range = []
|
||||||
Array(@resource[:network]).each do |rng|
|
Array(@resource[:network]).each do |rng|
|
||||||
ip = rng.split('-')
|
ip = rng.split('-')
|
||||||
|
|
Loading…
Reference in New Issue