lib/ridley/chef_objects/node_object.rb in ridley-1.3.0 vs lib/ridley/chef_objects/node_object.rb in ridley-1.3.1
- old
+ new
@@ -65,21 +65,21 @@
# @example
# node.public_hostname => "reset.riotgames.com"
#
# @return [String]
def public_hostname
- self.cloud? ? self.automatic[:cloud][:public_hostname] : self.automatic[:fqdn]
+ self.cloud? ? self.automatic[:cloud][:public_hostname] || self.automatic[:fqdn] : self.automatic[:fqdn]
end
# Returns the public IPv4 address of the instantiated node. This ip address should be
# used for public communications to the node.
#
# @example
# node.public_ipv4 => "10.33.33.1"
#
# @return [String]
def public_ipv4
- self.cloud? ? self.automatic[:cloud][:public_ipv4] : self.automatic[:ipaddress]
+ self.cloud? ? self.automatic[:cloud][:public_ipv4] || self.automatic[:ipaddress] : self.automatic[:ipaddress]
end
alias_method :public_ipaddress, :public_ipv4
# Returns the cloud provider of the instantiated node. If the node is not identified as
# a cloud node, then nil is returned.