bosh-director 1.3262.4.0 → 1.3262.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fef907f7eb794345ecc71719479d6bccce8c38cd
-  data.tar.gz: 4a096667cc426bde89ea2857699f5f6540a67038
+  metadata.gz: 190cc25c75c791c37722cc202e4a39612d01185b
+  data.tar.gz: e867afc4a2edd962e6cf02a82269052817920617
 SHA512:
-  metadata.gz: 8895ccf2fb097b628415ec8800a6694e57c3e523e0d9ce05430fb2bc7098f5bf586ac6ad5278d7b552c2f4a426919583d92d994c0975a8209ff482dfad70bff2
-  data.tar.gz: 6f92d6c25bae4f77039889e3755715399b18bfa1fab63ac28a763c1e72dbe7d8fa551c66f012371d30f82f188e771baa395182d6fc33384ca29dd7c819f9f150
+  metadata.gz: fd392842a3bf5ceec33cbb401f6434f78994892d65d79ae257447baf87c907ecc985a967709942defc2bf18a5a8747018a7afb728737c4972b646ec37e8a3424
+  data.tar.gz: 285e747b26c8b0327429bc89687e631716cc1368fbec7938f5f84b62a30f6d5dc892edbaaf7b94e7320304984ad02935fe1617e31d73cbbbe2a8fd2c801d1748

data/lib/bosh/director/deployment_plan/assembler.rb

@@ -19,9 +19,13 @@ module Bosh::Director
       bind_releases
 
       migrate_legacy_dns_records
+
       network_reservation_repository = Bosh::Director::DeploymentPlan::NetworkReservationRepository.new(@deployment_plan, @logger)
-      instance_repo = Bosh::Director::DeploymentPlan::InstanceRepository.new(network_reservation_repository, @logger)
       states_by_existing_instance = current_states_by_instance(@deployment_plan.candidate_existing_instances)
+
+      migrate_existing_instances_to_global_networking(network_reservation_repository, states_by_existing_instance)
+
+      instance_repo = Bosh::Director::DeploymentPlan::InstanceRepository.new(network_reservation_repository, @logger)
       index_assigner = Bosh::Director::DeploymentPlan::PlacementPlanner::IndexAssigner.new(@deployment_plan.model)
       instance_plan_factory = Bosh::Director::DeploymentPlan::InstancePlanFactory.new(instance_repo, states_by_existing_instance, @deployment_plan.skip_drain, index_assigner, network_reservation_repository, {'recreate' => @deployment_plan.recreate})
       instance_planner = Bosh::Director::DeploymentPlan::InstancePlanner.new(instance_plan_factory, @logger)
@@ -154,5 +158,18 @@ module Bosh::Director
         @dns_manager.migrate_legacy_records(instance_model)
       end
     end
+
+    def migrate_existing_instances_to_global_networking(network_reservation_repository, states_by_existing_instance)
+      return unless @deployment_plan.using_global_networking?
+
+      # in the case where this is their first transition to global networking, we need to make sure we have already
+      # populated the database/models with the existing IPs. Do this first before we start any of our planning.
+      @deployment_plan.instance_models.each do |existing_instance|
+        network_reservation_repository.migrate_existing_instance_network_reservations(
+          existing_instance,
+          states_by_existing_instance[existing_instance]
+        )
+      end
+    end
   end
 end

data/lib/bosh/director/deployment_plan/instance_network_reservations.rb

@@ -9,7 +9,7 @@ module Bosh::Director
         reservations.logger.debug("Creating instance network reservations from agent state for instance '#{instance_model}'")
 
         state.fetch('networks', []).each do |network_name, network_config|
-          reservations.add_existing(instance_model, deployment, network_name,  network_config['ip'], '', network_config['type'])
+          reservations.add_existing(instance_model, deployment, network_name, network_config['ip'], '', network_config['type'])
         end
 
         reservations

data/lib/bosh/director/deployment_plan/network_reservation_repository.rb

@@ -16,5 +16,11 @@ module Bosh::Director::DeploymentPlan
         InstanceNetworkReservations.new(@logger)
       end
     end
+
+    def migrate_existing_instance_network_reservations(existing_instance_model, existing_instance_state)
+      if !existing_instance_state.nil? && existing_instance_model.ip_addresses.empty?
+        InstanceNetworkReservations.create_from_state(existing_instance_model, existing_instance_state, @deployment_plan, @logger)
+      end
+    end
   end
 end

data/lib/bosh/director/jobs/db_job.rb

@@ -21,7 +21,13 @@ module Bosh::Director
         end
 
         process_status = ForkedProcess.run do
-          @job_class.perform(@task_id, *decode(encode(@args)))
+          perform_args = []
+
+          unless @args.nil?
+            perform_args = decode(encode(@args))
+          end
+
+          @job_class.perform(@task_id, *perform_args)
         end
 
         if process_status.signaled?

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3262.4.0'
+    VERSION = '1.3262.24.0'
   end
 end

data/lib/bosh/director/vm_creator.rb

@@ -139,6 +139,20 @@ module Bosh::Director
         env['bosh']['password'] = sha512_hashed_password
       end
 
+      if instance_model.job
+        env['bosh'] ||= {}
+        env['bosh']['group'] = Canonicalizer.canonicalize("#{Bosh::Director::Config.name}-#{instance_model.deployment.name}-#{instance_model.job}")
+        env['bosh']['groups'] = [
+          Bosh::Director::Config.name,
+          instance_model.deployment.name,
+          instance_model.job,
+          "#{Bosh::Director::Config.name}-#{instance_model.deployment.name}",
+          "#{instance_model.deployment.name}-#{instance_model.job}",
+          "#{Bosh::Director::Config.name}-#{instance_model.deployment.name}-#{instance_model.job}"
+        ]
+        env['bosh']['groups'].map! { |name| Canonicalizer.canonicalize(name) }
+      end
+
       count = 0
       begin
         vm_cid = @cloud.create_vm(agent_id, stemcell.cid, cloud_properties, network_settings, disks, env)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.3262.4.0
+  version: 1.3262.24.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,112 +16,112 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.4.0
+        version: 1.3262.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.4.0
+        version: 1.3262.24.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.4.0
+        version: 1.3262.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.4.0
+        version: 1.3262.24.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.4.0
+        version: 1.3262.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.4.0
+        version: 1.3262.24.0
 - !ruby/object:Gem::Dependency
   name: blobstore_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.4.0
+        version: 1.3262.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.4.0
+        version: 1.3262.24.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.4.0
+        version: 1.3262.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.4.0
+        version: 1.3262.24.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.4.0
+        version: 1.3262.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.4.0
+        version: 1.3262.24.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.4.0
+        version: 1.3262.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.4.0
+        version: 1.3262.24.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.3
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -193,19 +193,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: fog-openstack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.34.0
+        version: 0.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.34.0
+        version: 0.1.7
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement