bosh_openstack_cpi 1.2739.0 → 1.2743.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee4017a97b49dc2f34ddd078fc99feaa345f6cc3
-  data.tar.gz: 9e0d98ca439ee06d5dcb46482eaa6af6a7d9ad67
+  metadata.gz: 6a1bc8f7f331dd2ee6a73be9ef2941587e31f709
+  data.tar.gz: 08b4aa714a1ae17ced573d62f80c2cf5d9144ed1
 SHA512:
-  metadata.gz: 17da6ca3cc2b06ba342604dea03121cf17ca00a00ce834fc606c06b369a6525b86815b4e42a85b2a65461fd97dca17c56465a1781650c324f1b87c2a937c7d08
-  data.tar.gz: ae55d354e839c650c4d074e53221c4c789c361c12dcca851b4578837db969698a4e2e8ad44a87b7eb70dcb4822c84b6f54430d7378884e0500ee347c4c37f870
+  metadata.gz: cb86c810da3eebf9cd898d58f8d36f046a4cbf943bb031631e2f0faa122a23c53662c51847f582334f0bca07a1e7f37ac1a2d81bb6615359edc75b9c3bce7863
+  data.tar.gz: 6c0b429b35489c48f629bb85fed2d22e3a47f31458f97c4b2b4acb684814ab0ac7ded60c8a62dd9464d174d2f2bb47498472d1b815234838b1e037888a8ee4c5

data/lib/cloud/openstack/cloud.rb

@@ -371,7 +371,7 @@ module Bosh::OpenStackCloud
 
         compare_security_groups(server, network_configurator.security_groups(@default_security_groups))
 
-        compare_private_ip_addresses(server, network_configurator.private_ip)
+        compare_private_ip_addresses(server, network_configurator.private_ips)
 
         network_configurator.configure(@openstack, server)
 
@@ -845,17 +845,17 @@ module Bosh::OpenStackCloud
     # Compares actual server private IP addresses with the IP address specified at the network spec
     #
     # @param [Fog::Compute::OpenStack::Server] server OpenStack server
-    # @param [String] specified_ip_address IP address specified at the network spec (if Manual network)
+    # @param [Array] specified_ip_addresses IP addresses specified at the network spec (if Manual network)
     # @return [void]
     # @raise [Bosh::Clouds:NotSupported] If the IP address change, we need to recreate the VM as you can't
     # change the IP address of a running server, so we need to send the InstanceUpdater a request to do it for us
-    def compare_private_ip_addresses(server, specified_ip_address)
+    def compare_private_ip_addresses(server, specified_ip_addresses)
       actual_ip_addresses = with_openstack { server.private_ip_addresses }
 
-      unless specified_ip_address.nil? || actual_ip_addresses.include?(specified_ip_address)
+      unless specified_ip_addresses.empty? || actual_ip_addresses.sort == specified_ip_addresses.sort
         raise Bosh::Clouds::NotSupported,
               'IP address change requires VM recreation: %s to %s' %
-              [actual_ip_addresses.join(', '), specified_ip_address]
+              [actual_ip_addresses.join(', '), specified_ip_addresses.join(', ')]
       end
     end
 

data/lib/cloud/openstack/network_configurator.rb

@@ -22,41 +22,55 @@ module Bosh::OpenStackCloud
       end
 
       @logger = Bosh::Clouds::Config.logger
-      @network = nil
+      @networks = []
       @vip_network = nil
       @security_groups = []
-      @net_id = nil
+      @net_ids = []
+      @dynamic_network = nil
 
       spec.each_pair do |name, network_spec|
-        network_type = network_spec["type"] || "manual"
-
-        case network_type
-          when "dynamic"
-            cloud_error("Must have exactly one dynamic or manual network per instance") if @network
-            @network = DynamicNetwork.new(name, network_spec)
-            @security_groups += extract_security_groups(network_spec)
-            @net_id = extract_net_id(network_spec)
-
-          when "manual"
-            cloud_error("Must have exactly one dynamic or manual network per instance") if @network
-            @network = ManualNetwork.new(name, network_spec)
-            @security_groups += extract_security_groups(network_spec)
-            @net_id = extract_net_id(network_spec)
-            cloud_error("Manual network must have net_id") if @net_id.nil?
-
-          when "vip"
-            cloud_error("More than one vip network") if @vip_network
-            @vip_network = VipNetwork.new(name, network_spec)
-            @security_groups += extract_security_groups(network_spec)
-
-          else
-            cloud_error("Invalid network type `#{network_type}': OpenStack " \
-                        "CPI can only handle `dynamic', 'manual' or `vip' " \
-                        "network types")
-        end
+        initialize_network(name, network_spec)
       end
 
-      cloud_error("At least one dynamic or manual network should be defined") if @network.nil?
+      cloud_error("At least one dynamic or manual network should be defined") if @networks.empty?
+    end
+
+    ##
+    # Setup network configuration for one network spec.
+    #
+    # @param [String] network spec name
+    # @param [Hash] network spec
+    #   configure
+    def initialize_network(name, network_spec)
+      network_type = network_spec["type"] || "manual"
+
+      case network_type
+        when "dynamic"
+          cloud_error("Only one dynamic network per instance should be defined") if @dynamic_network
+          net_id = extract_net_id(network_spec)
+          cloud_error("Dynamic network with id #{net_id} is already defined") if @net_ids.include?(net_id)
+          network = DynamicNetwork.new(name, network_spec)
+          @security_groups += extract_security_groups(network_spec)
+          @networks << {"network" => network, "net_id" => net_id}
+          @net_ids << net_id
+          @dynamic_network = network
+        when "manual"
+          net_id = extract_net_id(network_spec)
+          cloud_error("Manual network must have net_id") if net_id.nil?
+          cloud_error("Manual network with id #{net_id} is already defined") if @net_ids.include?(net_id)
+          network = ManualNetwork.new(name, network_spec)
+          @security_groups += extract_security_groups(network_spec)
+          @networks << {"network" => network, "net_id" => net_id}
+          @net_ids << net_id
+        when "vip"
+          cloud_error("Only one VIP network per instance should be defined") if @vip_network
+          @vip_network = VipNetwork.new(name, network_spec)
+          @security_groups += extract_security_groups(network_spec)
+        else
+          cloud_error("Invalid network type `#{network_type}': OpenStack " \
+                      "CPI can only handle `dynamic', 'manual' or `vip' " \
+                      "network types")
+      end
     end
 
     ##
@@ -66,7 +80,10 @@ module Bosh::OpenStackCloud
     # @param [Fog::Compute::OpenStack::Server] server OpenStack server to
     #   configure
     def configure(openstack, server)
-      @network.configure(openstack, server)
+      @networks.each do |network_info|
+        network = network_info["network"]
+        network.configure(openstack, server)
+      end
 
       if @vip_network
         @vip_network.configure(openstack, server)
@@ -102,11 +119,15 @@ module Bosh::OpenStackCloud
     end
 
     ##
-    # Returns the private IP address for this network configuration
+    # Returns the private IP addresses for this network configuration
     #
-    # @return [String] private ip address
-    def private_ip
-      @network.is_a?(ManualNetwork) ? @network.private_ip : nil   
+    # @return [Array<String>] private ip addresses
+    def private_ips
+      @networks.inject([]) do |memo, network_info|
+        network = network_info["network"]
+        memo << network.private_ip if network.is_a?(ManualNetwork)
+        memo
+      end
     end
 
     ##
@@ -114,10 +135,15 @@ module Bosh::OpenStackCloud
     #
     # @return [Array] nics
     def nics
-      nic = {}
-      nic["net_id"] = @net_id if @net_id
-      nic["v4_fixed_ip"] = @network.private_ip if @network.is_a? ManualNetwork
-      nic.any? ? [nic] : []
+      @networks.inject([]) do |memo, network_info|
+        net_id = network_info["net_id"]
+        network = network_info["network"]
+        nic = {}
+        nic["net_id"] = net_id if net_id
+        nic["v4_fixed_ip"] = network.private_ip if network.is_a?(ManualNetwork)
+        memo << nic if nic.any?
+        memo
+      end
     end
 
     private
@@ -157,4 +183,4 @@ module Bosh::OpenStackCloud
     end
 
   end
-end
+end

data/lib/cloud/openstack/version.rb

@@ -3,6 +3,6 @@
 
 module Bosh
   module OpenStackCloud
-    VERSION = '1.2739.0'
+    VERSION = '1.2743.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_openstack_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2739.0
+  version: 1.2743.0
 platform: ruby
 authors:
 - Piston Cloud Computing / VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -100,17 +100,17 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.1.0
 description: |-
   BOSH OpenStack CPI
-  0d77bd
+  01851c
 email: support@cloudfoundry.com
 executables:
 - bosh_openstack_console