Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use mash for options, strings & symbols for consistency, add ip attribute #21

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

use mash for options, strings & symbols for consistency, add ip attribute #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62bd556
use mash for options, strings & symbols for consistency, add ip path …
agoddard Dec 5, 2014
eabb00e
allow ip address attribute
agoddard Dec 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 25 additions & 10 deletions libraries/ipaddress.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,25 @@ def private_network_for_label(node, label)
end

def ipaddress(options = {})
raise "Options must be a hash" unless
options.respond_to? :has_key?
raise "Options does not contain a node key" unless
options.has_key? :node
raise "Options does not contain a remote_node key" unless
options.has_key? :remote_node
raise "Options type is invalid" if
options.has_key? :type and not
[:local, :public, :label].include?(options[:type])
options = Mash.new(options)

unless options.respond_to? :has_key?
raise "Options must be a mash"
end

unless options.has_key? :node
raise "Options does not contain a node key"
end

unless options.has_key? :remote_node
raise "Options does not contain a remote_node key"
end

if options.has_key? :type
unless ['local', 'public', 'label'].include?(options[:type].to_s)
raise "Options type is invalid"
end
end

options[:type] ||=
if provider_for_node(options[:remote_node]) == provider_for_node(options[:node])
Expand All @@ -56,12 +66,17 @@ def ipaddress(options = {})

Chef::Log.debug "ipaddress[#{options[:type]}]: attempting to determine ip address for #{options[:node].name}"

case options[:type]
case options[:type].to_sym
when :label
network = private_network_for_label(options[:remote_node], options[:label])
network[:ips][0][:ip]
else
cloud_ipv4 = options[:remote_node][:cloud]["#{options[:type]}_ipv4"] rescue nil
if options[:ipaddress_attribute]
cloud_ipv4 = options[:ipaddress_attribute].split('.').inject(options[:remote_node]) do |memo, key|
memo[key] || break
end
end
cloud_ipv4 || options[:remote_node][:ipaddress]
end
end
Expand Down