cloud66_agent 1.2.0 → 1.2.1.beta1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzY5YzEwYjIxZGVjNGVjMDIyYmUwZDYzMDg5NDgzYzcxYmIyMWMyMg==
+    OWJmOWMzYzg2OTExNWE4YTU2MzkzM2Y1MmU1ZWEwZDU0ZGI4OTVmMQ==
   data.tar.gz: !binary |-
-    ZjcwZDA5N2E2YmZkNGI5NDIyOGE3OGYxNTkyM2MzZmU1ODA4YTIxNQ==
+    YzFlNzExM2Q5M2FiNWVhYWE0ZGIwZTNmNjM2NTQ5NmJkMWUzMDI4ZQ==
 SHA512:
   metadata.gz: !binary |-
-    MDE5ODUxNDVmNzk1M2YzMDgyOTNiMTM2ZWNjMTg3ZGMzYWFkZmRlZThiMGQz
-    N2M2MTQ2MWExNTgwNWJmODgxMzY4NTA5ZjhhNDNkZWYyNzMyZDkxNzgzY2Y0
-    ZmEwZTA3ZWQ2MTk2NjY0ZjFiMWFhZDc1YzY2YzU1YjJiZjRjNWM=
+    YzcyYzAzOWUxNmI4Nzk4N2RiZTljYzI3ODc3NTE2ZmJlNmEwZmMxNzc5N2Fh
+    ZjRlNTg0MGEyNTkzNThiNmFkZDkxMzI5NTAwNTJjYmFmN2I5M2RlZTcyYzgy
+    MjE2YjI1NGUzMTQ3Zjk3ZjEwYTQ5ODM3NGU2YmM1N2U4YzE5N2E=
   data.tar.gz: !binary |-
-    NDgzMmIzNWIzNmViMGUxOWEwODNhMGQ3Yjk3ODY0NjAyNjg4ZTZlZTMwMmRl
-    ZWU5YmJkMmRlZjYzOGVkZTVhYzdiNzU2MjUxYzI2NDkwMDgzNzhiNDQ4Njhk
-    NmQyODQzM2ViOGRiMjM4ZTRlMTI2ZmU1ODA3NDRlYzI4NmUxZGY=
+    MzBkYTFmYTBiNzRlNGMyYmJjOTAyMDI1MTZkNTY4YTQ2ZjhiOGU2ZTIyY2Ux
+    ZTZlMTA0NjNlMDMyNzhlOGZmZDg5MjFhMDFlYzcwYTk3NWZhYTI0ZTdmNDk3
+    MWU1YTNlMTMyZTExNWE3Y2JmYjQ5MTMwMGQ3ODA2Yzk1NDgwMDM=

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p448
+ruby-1.9.3

data/lib/cloud66_agent/commands/configure.rb

@@ -10,10 +10,21 @@ module Cloud66
 					if cloud.nil? || cloud.empty?
 						# try figure it out
 						$config.is_aws = Utils::VitalSigns.is_aws?
+
+						if $config.is_aws
+							$config.is_gc = false
+						else
+							# try figure it out
+							$config.is_gc = Utils::VitalSigns.is_gc?
+						end
 					else
 						# use the passed in value
 						$config.is_aws = (cloud == 'aws')
+
+						# use the passed in value
+						$config.is_gc = (cloud == 'googlecloud')
 					end
+
 					address_info = Utils::VitalSigns.address_info
 					data = {
 						:timezone => Time.new.zone,

data/lib/cloud66_agent/utils/config.rb

@@ -13,6 +13,7 @@ module Cloud66
 						  :agent_uid,
 						  :disabled,
 						  :is_aws,
+						  :is_gc,
 						  :log,
 						  :log_level
 
@@ -26,6 +27,7 @@ module Cloud66
 				@api_url ||= 'https://api.cloud66.com'
 				@disabled ||= false
 				@is_aws ||= false
+				@is_gc ||= false
 			end
 
 			def is_agent_configured?
@@ -43,6 +45,7 @@ module Cloud66
 						'agent_uid' => @agent_uid,
 						'disabled' => @disabled,
 						'is_aws' => @is_aws,
+						'is_gc' => @is_gc,
 						'log' => @log == STDOUT ? "STDOUT" : @log,
 						'log_level' => @log_level,
 					}
@@ -65,6 +68,7 @@ module Cloud66
 				@agent_uid = config['agent_uid']
 				@disabled = config['disabled']
 				@is_aws = config['is_aws']
+				@is_gc = config['is_gc']
 				@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, 2, 0
+			MAJOR, MINOR, PATCH = 1, 2, 1
 
 			#ie. PRERELEASE_MODIFIER = 'beta1' or nil
-			PRERELEASE_MODIFIER = nil
+			PRERELEASE_MODIFIER = 'beta1'
 
 			##
 			# Returns the major version ( big release based off of multiple minor releases )

data/lib/cloud66_agent/utils/vital_signs.rb

@@ -16,11 +16,23 @@ module Cloud66
 				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]?)$/
+				# GC special case
+				elsif $config.is_gc
+					external_ip = `/usr/bin/curl -H "Metadata-Flavor: Google" http://metadata/computeMetadata/v1/instance/network-interfaces/0/access-configs/0/external-ip`
+					result[:ext_ipv4] = external_ip if external_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')
+
+				# GC special case
+				if $config.is_gc
+					internal_ip = `/usr/bin/curl -H "Metadata-Flavor: Google" http://metadata/computeMetadata/v1/instance/network-interfaces/0/ip`
+					result[:int_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
+					result[:int_ipv4] = hash['ipaddress_eth0'] if hash.has_key?('ipaddress_eth0')
+				end
+				
 				result[:ext_ipv6] = hash['ipaddress6'] if hash.has_key?('ipaddress6')
 				result[:int_ipv6] = hash['ipaddress6_eth0'] if hash.has_key?('ipaddress6_eth0')
 
@@ -45,6 +57,16 @@ module Cloud66
 				return true
 			end
 
+			def self.is_gc?
+				# 6 seconds to find out if this is a AWS image or not!
+				external_ip = `/usr/bin/curl --connect-timeout 6 -H "Metadata-Flavor: Google" http://metadata/computeMetadata/v1/instance/network-interfaces/0/access-configs/0/external-ip` rescue nil
+				return false if external_ip.nil? || external_ip.empty?
+				return false unless external_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]?)$/
+
+				# it is google cloud
+				return true
+			end
+
 			private
 
 			# parse the data, not using YAML due to YAML parsing issues and JSON output not always working

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud66_agent
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1.beta1
 platform: ruby
 authors:
 - Cloud 66
@@ -141,12 +141,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Cloud 66 server component