cloud66_agent 1.0.7 → 1.0.8.pre1

data/cloud66_agent.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
 	gem.name = "cloud66_agent"
 	gem.version = Cloud66::Utils::Version.current
 	gem.platform = Gem::Platform::RUBY
-	gem.date = '2013-04-11'
+	gem.date = '2013-04-18'
 	gem.authors = ["Cloud 66"]
 	gem.email = ['hello@cloud66.com']
 	gem.description = "See https://www.cloud66.com for more info"

data/lib/cloud66_agent/commands/configure.rb

@@ -7,6 +7,7 @@ module Cloud66
 		class Configure
 			def self.perform(server_uid)
 				begin
+					$config.is_aws = Utils::VitalSigns.is_aws?
 					address_info = Utils::VitalSigns.address_info
 					data = {
 						:timezone => Time.new.zone,

data/lib/cloud66_agent/utils/config.rb

@@ -1,3 +1,5 @@
+require 'cloud66_agent/utils/vital_signs'
+
 module Cloud66
 	module Utils
 		class Config
@@ -10,6 +12,7 @@ module Cloud66
 						  :secret_key,
 						  :agent_uid,
 						  :disabled,
+						  :is_aws,
 						  :log,
 						  :log_level
 
@@ -22,6 +25,7 @@ module Cloud66
 				@log_level ||= 2
 				@api_url ||= 'https://api.cloud66.com'
 				@disabled ||= false
+				@is_aws ||= false
 			end
 
 			def is_agent_configured?
@@ -38,6 +42,7 @@ module Cloud66
 						'secret_key' => @secret_key,
 						'agent_uid' => @agent_uid,
 						'disabled' => @disabled,
+						'is_aws' => @is_aws,
 						'log' => @log == STDOUT ? "STDOUT" : @log,
 						'log_level' => @log_level,
 					}
@@ -59,6 +64,7 @@ module Cloud66
 				@secret_key = config['secret_key']
 				@agent_uid = config['agent_uid']
 				@disabled = config['disabled']
+				@is_aws = config['is_aws']
 				@log = config['log']
 				@log_level = config['log_level']
 			rescue

data/lib/cloud66_agent/utils/version.rb

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

data/lib/cloud66_agent/utils/vital_signs.rb

@@ -12,14 +12,15 @@ module Cloud66
 
 			def self.address_info
 				# address information
-				hash = parse_data(`facter ipaddress ec2_public_ipv4 ipaddress_eth0 ipaddress6 ipaddress6_eth0`)
+				hash = parse_data(`facter ipaddress ipaddress_eth0 ipaddress6 ipaddress6_eth0`)
 
 				result = {}
-				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)
+				# AWS special case
+				if $config.is_aws
+					reported_ip = `/usr/bin/curl -s 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
 					result[:ext_ipv4] = hash['ipaddress']
 				end
 				result[:int_ipv4] = hash['ipaddress_eth0'] if hash.has_key?('ipaddress_eth0')
@@ -27,7 +28,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
@@ -41,6 +42,11 @@ module Cloud66
 				}
 			end
 
+			def self.is_aws?
+				hash = parse_data(`facter ec2_ami_id`)
+				return hash.has_key?('ec2_ami_id')
+			end
+
 			private
 
 			def self.disk_usage_info

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cloud66_agent
 version: !ruby/object:Gem::Version
-  version: 1.0.7
-  prerelease: 
+  version: 1.0.8.pre1
+  prerelease: 6
 platform: ruby
 authors:
 - Cloud 66
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25