cloud66_agent 1.0.7.pre1 → 1.0.7

data/lib/cloud66_agent/utils/version.rb

@@ -16,7 +16,7 @@ module Cloud66
 			MAJOR, MINOR, PATCH = 1, 0, 7
 
 			#ie. PRERELEASE_MODIFIER = 'beta1'
-			PRERELEASE_MODIFIER = 'pre1'
+			PRERELEASE_MODIFIER = nil
 
 			##
 			# Returns the major version ( big release based off of multiple minor releases )

data/lib/cloud66_agent/utils/vital_signs.rb

@@ -12,16 +12,14 @@ module Cloud66
 
 			def self.address_info
 				# address information
-				hash = parse_data(`facter ipaddress ipaddress_eth0 ipaddress6 ipaddress6_eth0 ec2_ami_id`)
+				hash = parse_data(`facter ipaddress ec2_public_ipv4 ipaddress_eth0 ipaddress6 ipaddress6_eth0`)
 
 				result = {}
-				# AWS special case
-				if hash.has_key?('ec2_ami_id')
-					# set ec2 external ip address
-					reported_ip = `/usr/bin/curl http://169.254.169.254/latest/meta-data/public-ipv4`
-					result[:ext_ipv4] = reported_ip if reported_ip =~ /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/
-				else
-					# set general external ip address
+				if hash.has_key?('ec2_public_ipv4')
+					# return ec2 info first (most specific)
+					result[:ext_ipv4] = hash['ec2_public_ipv4']
+				elsif hash.has_key?('ipaddress')
+					# return ip address next (general)
 					result[:ext_ipv4] = hash['ipaddress']
 				end
 				result[:int_ipv4] = hash['ipaddress_eth0'] if hash.has_key?('ipaddress_eth0')
@@ -29,7 +27,7 @@ module Cloud66
 				result[:int_ipv6] = hash['ipaddress6_eth0'] if hash.has_key?('ipaddress6_eth0')
 
 				# don't have any ip address info
-				raise 'no address information' if result.empty? || !result.has_key?(:ext_ipv4)
+				raise "no address information" if result.empty? || !result.has_key?(:ext_ipv4)
 
 				# return ip address info
 				return result

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cloud66_agent
 version: !ruby/object:Gem::Version
-  version: 1.0.7.pre1
-  prerelease: 6
+  version: 1.0.7
+  prerelease: 
 platform: ruby
 authors:
 - Cloud 66
@@ -151,9 +151,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25