rancher-metadata 0.17.4 → 0.17.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 930d308438607c980b53c7806dcd576378341575
-  data.tar.gz: a22c6f66f4f8b121e390938bbcdd7d70af8d6d0a
+  metadata.gz: 5467d2c11bfe48b395bd83e5f825160da89c95d0
+  data.tar.gz: e577c1fe121ed79030fc9d51a58924640beb4694
 SHA512:
-  metadata.gz: 4e30f43fec3d920f0a058095c6b975b371f806cba0291f1c1e1578a4c7fcef9d27062e763ca41fafe617fdc8da25648fd4960c7bcd5c1feee63b535c26265a6b
-  data.tar.gz: 7d87ece64f2ab381e42ebddb1993af6a09f4e6e6e3e952c763bbc7477f26f8b37f59ebd004f25cdebe892ec8cfa986502786479097cd862851de0ec103f9f071
+  metadata.gz: 2944b89d04b249a8f4cf8d31370384ca271c108e97dc4f46942ac5318ac704050adf45188b3dfa74a21dc10b1b3b0603deaf7a10b09aaa328337ed889e00d8c1
+  data.tar.gz: 93f57158527773f4157f04a71b36d0cc9ecd3f32fbef56f11f0f6b43646eaa9440f57437ea9c927c937cb2ef98228ab24b21fde0891593147bfd9baf607ed9be

data/README.md

@@ -23,7 +23,7 @@ puts("Container service name: #{api.get_container_service_name}")
 puts("Container hostname: #{api.get_container_hostname}")
 
 api.wait_service_containers() do |name, container|
-  puts("Container #{name} is up (ip: #{container['primary_ip']}, create index: #{container['create_index']}, service suffix: #{api.get_container_service_suffix(name))")
+  puts("Container #{name} is up (ip: #{container['primary_ip']}, create index: #{container['create_index']}, service suffix: #{container['service_suffix']})")
 end
 
 metadata = api.get_service_metadata

data/lib/rancher-metadata/api.rb

@@ -148,7 +148,18 @@ module RancherMetadata
     end
 
     def get_container(container_name = nil)
-      container_name ? self.api_get("/containers/#{container_name}") : self.api_get("/self/container")
+      container = nil
+
+      if container_name
+        container = self.api_get("/containers/#{container_name}")
+      else
+        container = self.api_get("/self/container")
+      end
+
+      # FIXME: https://github.com/rancher/cattle/pull/1197
+      container['service_suffix'] = self.get_container_service_suffix(container_name) unless container.has_key?('service_suffix')
+
+      container
     end
 
     def get_container_field(field, container_name = nil)
@@ -166,6 +177,7 @@ module RancherMetadata
 
     def get_container_ip(container_name = nil)
       if container_name
+        # FIXME: https://github.com/rancher/rancher/issues/2750
         if self.is_network_managed?
           self.api_get("/self/container/primary_ip")
         else

data/lib/rancher-metadata/version.rb

@@ -5,7 +5,7 @@
 #
 
 module RancherMetadata
-  VERSION = "0.17.4"
+  VERSION = "0.17.5"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rancher-metadata
 version: !ruby/object:Gem::Version
-  version: 0.17.4
+  version: 0.17.5
 platform: ruby
 authors:
 - Matteo Cerutti