lib/chef/knife/openstack_helpers.rb in knife-openstack-1.3.2.pre vs lib/chef/knife/openstack_helpers.rb in knife-openstack-1.3.2.pre.1

@@ -2,28 +2,40 @@
 
 class Chef
   class Knife
     class Cloud
       module OpenstackHelpers
-
         def primary_private_ip_address(addresses)
           primary_network_ip_address(addresses, 'private')
         end
 
         def primary_public_ip_address(addresses)
           primary_network_ip_address(addresses, 'public')
         end
 
         def primary_network_ip_address(addresses, network_name)
-          return addresses[network_name].last['addr'] if addresses[network_name] && !addresses[network_name].empty?
+          addresses[network_name].last['addr'] if addresses[network_name] && !addresses[network_name].empty?
         end
 
         def create_service_instance
           OpenstackService.new
         end
 
         def validate!
           super(:openstack_username, :openstack_password, :openstack_auth_url)
+        end
+
+        def instance_addresses(addresses)
+          info = []
+          if addresses[addresses.keys[0]] && addresses[addresses.keys[0]].size > 0
+            ips = addresses[addresses.keys[0]]
+            ips.each do |ip|
+              version = 'IPv6' if ip['version'] == 6
+              version = 'IPv4' if ip['version'] == 4
+              info << "#{addresses.keys[0]}:#{version}: #{ip['addr']}"
+            end
+          end
+          info.join(' ')
         end
       end
     end
   end
 end