odania 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9ffca23df7f0bcf704ee4dfeb787327b6d22513
-  data.tar.gz: 1c5ad5ec6aad793ca550ffc6d46ca6f22b8d7aa9
+  metadata.gz: d506a9221ab23566539c2d3c4ef05591c9c52708
+  data.tar.gz: a875aed746071e7c03818b937af551bd59eae577
 SHA512:
-  metadata.gz: 131db8a62b7dea4c0a3536e9058806b0bec5a1fc94c7241d1a33dc3d1c7574b328ef2700a57ff0e2ce1688d4808a8539c5b9755848ef936b9b6135ffd774c653
-  data.tar.gz: 491ea63fd9f1c76befb728d332ef9863dbe95da956f7586c6f6df314f52faabc62b7a2cb2572c472c35403b6d977693b63177a5154cee4421fa7533e4bfb005c
+  metadata.gz: c8808a430e8ace883a91f90fdb4300533b130e482ce1db76287966c9f5941ba8a97dc539e4364dd30422fe1d75b4764fc5605a43cc134dc47bf4b2598aa31155
+  data.tar.gz: 9ecdd650491184c8cb6ce4540c91c03c10b1c5ee5bca7fd1e87487501a3432c98b3460031cfd45228474f1670006d4ba8ad7060d6f0225981da1531c809d76c4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    odania (0.0.22)
+    odania (0.0.23)
       deep_merge
       diplomat
       erubis

data/lib/odania/varnish.rb

@@ -76,7 +76,7 @@ module Odania
 
 			ips = Odania.ips
 			plugin_config['plugin-config']['ips'] = ips
-			plugin_config['plugin-config']['ip'] = ips.first
+			plugin_config['plugin-config']['ip'] = primary_ip(ips)
 			plugin_config['plugin-config']['port'] = 80
 			plugin_config['plugin-config']['tags'] = ["plugin-#{get_plugin_name}"]
 			puts JSON.pretty_generate plugin_config if $debug
@@ -85,6 +85,15 @@ module Odania
 			Odania.plugin.register plugin_instance_name, plugin_config
 		end
 
+		# Rancher assigns two ip's the ip starting with 10. is routed through the hosts
+		def primary_ip(ips)
+			ips.each do |ip|
+				return ip if ip.start_with? '10.'
+			end
+
+			ips.first
+		end
+
 		def get_plugin_name
 			'odania_varnish'
 		end

data/lib/odania/version.rb

@@ -1,3 +1,3 @@
 module Odania
-  VERSION = '0.0.22'
+  VERSION = '0.0.23'
 end

data/spec/lib/odania/varnish_spec.rb

@@ -31,7 +31,7 @@ describe Odania::Varnish do
 
 		it 'generates the varnish config' do
 			$consul_mock.config.set('global_plugins_config', global_cfg)
-			expect(subject.generate('/tmp/varnish')).to eq('odania-varnish|odania_varnish_1')
+			expect(subject.generate('/tmp/varnish')).to eq("odania-varnish|odania_varnish_#{Socket.gethostname.gsub(/[^0-9a-zA-Z_]/, '_')}")
 		end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odania
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Mike Petersen