bosh-director 1.3202.0 → 1.3213.0

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3202.0'
+    VERSION = '1.3213.0'
   end
 end

data/lib/bosh/director/vm_creator.rb

@@ -1,9 +1,11 @@
 require 'common/deep_copy'
+require 'securerandom'
 
 module Bosh::Director
   # Creates VM model and call out to CPI to create VM in IaaS
   class VmCreator
     include EncryptionHelper
+    include PasswordHelper
 
     def initialize(cloud, logger, vm_deleter, disk_manager, job_renderer)
       @cloud = cloud
@@ -105,6 +107,12 @@ module Bosh::Director
         options[:credentials] = credentials
       end
 
+      password = env.fetch('bosh', {}).fetch('password', "")
+      if Config.generate_vm_passwords && password == ""
+        env['bosh'] ||= {}
+        env['bosh']['password'] = sha512_hashed_password
+      end
+
       count = 0
       begin
         vm_cid = @cloud.create_vm(agent_id, stemcell.cid, cloud_properties, network_settings, disks, env)

data/lib/cloud/dummy.rb

@@ -109,6 +109,7 @@ module Bosh
             networks: networks,
             vm: { name: "vm-#{agent_id}" },
             cert: '',
+            env: env,
             mbus: @options['nats'],
           })
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.3202.0
+  version: 1.3213.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
 - !ruby/object:Gem::Dependency
   name: blobstore_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -472,6 +472,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.1
+- !ruby/object:Gem::Dependency
+  name: unix-crypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -655,10 +669,18 @@ files:
 - db/migrations/director/20151030222853_add_templates_to_instance.rb
 - db/migrations/director/20151031001039_add_spec_to_instance.rb
 - db/migrations/director/20151109190602_rename_orphan_columns.rb
+- db/migrations/director/20151223172000_rename_requires_json.rb
 - db/migrations/director/20151229184742_add_vm_attributes_to_instance.rb
+- db/migrations/director/20160106162749_runtime_configs.rb
+- db/migrations/director/20160106163433_add_runtime_configs_to_deployments.rb
 - db/migrations/director/20160108191637_drop_vm_env_json_from_instance.rb
 - db/migrations/director/20160121003800_drop_vms_fkeys.rb
+- db/migrations/director/20160202162216_add_post_start_completed_to_instance.rb
+- db/migrations/director/20160210201838_denormalize_compiled_package_stemcell_id_to_stemcell_name_and_version.rb
 - db/migrations/director/20160211193904_add_scopes_to_deployment.rb
+- db/migrations/director/20160219175840_add_column_teams_to_deployments.rb
+- db/migrations/director/20160224222508_add_deployment_name_to_task.rb
+- db/migrations/director/20160225182206_rename_post_start_completed.rb
 - db/migrations/dns/20120123234908_initial.rb
 - lib/bosh/director.rb
 - lib/bosh/director/agent_client.rb
@@ -680,6 +702,7 @@ files:
 - lib/bosh/director/api/controllers/resources_controller.rb
 - lib/bosh/director/api/controllers/restore_controller.rb
 - lib/bosh/director/api/controllers/resurrection_controller.rb
+- lib/bosh/director/api/controllers/runtime_configs_controller.rb
 - lib/bosh/director/api/controllers/stemcells_controller.rb
 - lib/bosh/director/api/controllers/task_controller.rb
 - lib/bosh/director/api/controllers/tasks_controller.rb
@@ -699,6 +722,7 @@ files:
 - lib/bosh/director/api/restore_manager.rb
 - lib/bosh/director/api/resurrector_manager.rb
 - lib/bosh/director/api/route_configuration.rb
+- lib/bosh/director/api/runtime_config_manager.rb
 - lib/bosh/director/api/snapshot_manager.rb
 - lib/bosh/director/api/stemcell_manager.rb
 - lib/bosh/director/api/task_helper.rb
@@ -708,7 +732,6 @@ files:
 - lib/bosh/director/api/user/config_user_manager.rb
 - lib/bosh/director/api/user/database_user_manager.rb
 - lib/bosh/director/api/user/user_manager_provider.rb
-- lib/bosh/director/api/vm_state_manager.rb
 - lib/bosh/director/app.rb
 - lib/bosh/director/blob_util.rb
 - lib/bosh/director/blobstores.rb
@@ -716,9 +739,9 @@ files:
 - lib/bosh/director/compile_task.rb
 - lib/bosh/director/compile_task_generator.rb
 - lib/bosh/director/compiled_package.rb
-- lib/bosh/director/compiled_package/blob_sha_mismatch_error.rb
-- lib/bosh/director/compiled_package/compiled_package.rb
 - lib/bosh/director/compiled_package_group.rb
+- lib/bosh/director/compiled_release.rb
+- lib/bosh/director/compiled_release/manifest.rb
 - lib/bosh/director/compiled_release_downloader.rb
 - lib/bosh/director/compiled_release_manifest.rb
 - lib/bosh/director/config.rb
@@ -799,12 +822,14 @@ files:
 - lib/bosh/director/deployment_plan/planner_factory.rb
 - lib/bosh/director/deployment_plan/release_version.rb
 - lib/bosh/director/deployment_plan/resource_pool.rb
+- lib/bosh/director/deployment_plan/runtime_manifest_parser.rb
 - lib/bosh/director/deployment_plan/stemcell.rb
 - lib/bosh/director/deployment_plan/steps/package_compile_step.rb
 - lib/bosh/director/deployment_plan/steps/update_step.rb
 - lib/bosh/director/deployment_plan/template.rb
 - lib/bosh/director/deployment_plan/update_config.rb
 - lib/bosh/director/deployment_plan/vip_network.rb
+- lib/bosh/director/deployment_plan/vm_extension.rb
 - lib/bosh/director/deployment_plan/vm_type.rb
 - lib/bosh/director/disk_manager.rb
 - lib/bosh/director/dns/canonicalizer.rb
@@ -826,6 +851,7 @@ files:
 - lib/bosh/director/instance_deleter.rb
 - lib/bosh/director/instance_reuser.rb
 - lib/bosh/director/instance_updater.rb
+- lib/bosh/director/instance_updater/instance_state.rb
 - lib/bosh/director/instance_updater/preparer.rb
 - lib/bosh/director/instance_updater/state_applier.rb
 - lib/bosh/director/ip_util.rb
@@ -873,6 +899,7 @@ files:
 - lib/bosh/director/jobs/update_release.rb
 - lib/bosh/director/jobs/update_stemcell.rb
 - lib/bosh/director/jobs/vm_state.rb
+- lib/bosh/director/key_generator.rb
 - lib/bosh/director/lock.rb
 - lib/bosh/director/lock_helper.rb
 - lib/bosh/director/log_bundles_cleaner.rb
@@ -880,6 +907,7 @@ files:
 - lib/bosh/director/manifest/changeset.rb
 - lib/bosh/director/manifest/diff_lines.rb
 - lib/bosh/director/manifest/manifest.rb
+- lib/bosh/director/manifest/redactor.rb
 - lib/bosh/director/models.rb
 - lib/bosh/director/models/cloud_config.rb
 - lib/bosh/director/models/compiled_package.rb
@@ -901,6 +929,7 @@ files:
 - lib/bosh/director/models/release.rb
 - lib/bosh/director/models/release_version.rb
 - lib/bosh/director/models/rendered_templates_archive.rb
+- lib/bosh/director/models/runtime_config.rb
 - lib/bosh/director/models/snapshot.rb
 - lib/bosh/director/models/stemcell.rb
 - lib/bosh/director/models/task.rb
@@ -908,7 +937,10 @@ files:
 - lib/bosh/director/models/user.rb
 - lib/bosh/director/nats_rpc.rb
 - lib/bosh/director/network_reservation.rb
+- lib/bosh/director/package_dependencies_manager.rb
+- lib/bosh/director/password_helper.rb
 - lib/bosh/director/permission_authorizer.rb
+- lib/bosh/director/post_deployment_script_runner.rb
 - lib/bosh/director/problem_handlers/base.rb
 - lib/bosh/director/problem_handlers/inactive_disk.rb
 - lib/bosh/director/problem_handlers/invalid_problem.rb

data/lib/bosh/director/api/vm_state_manager.rb

@@ -1,9 +0,0 @@
-module Bosh::Director
-  module Api
-    class VmStateManager
-      def fetch_vm_state(username, deployment, format)
-        JobQueue.new.enqueue(username, Jobs::VmState, 'retrieve vm-stats', [deployment.id, format])
-      end
-    end
-  end
-end

data/lib/bosh/director/compiled_package/blob_sha_mismatch_error.rb

@@ -1,5 +0,0 @@
-require 'bosh/director/compiled_package'
-
-module Bosh::Director::CompiledPackage
-  class BlobShaMismatchError < StandardError; end
-end

data/lib/bosh/director/compiled_package/compiled_package.rb

@@ -1,30 +0,0 @@
-require 'digest/sha1'
-require 'bosh/director/compiled_package'
-require 'bosh/director/compiled_package/blob_sha_mismatch_error'
-
-module Bosh::Director::CompiledPackage
-  class CompiledPackage
-    attr_reader :package_name, :package_fingerprint, :sha1, :stemcell_sha1, :blobstore_id, :blob_path
-
-    def initialize(options = {})
-      @package_name = options.fetch(:package_name)
-      @package_fingerprint = options.fetch(:package_fingerprint)
-      @sha1 = options.fetch(:sha1)
-      @stemcell_sha1 = options.fetch(:stemcell_sha1)
-      @blobstore_id = options.fetch(:blobstore_id)
-      @blob_path = options.fetch(:blob_path)
-    end
-
-    def check_blob_sha
-      if sha1 != actual_sha
-        raise BlobShaMismatchError, "Blob SHA mismatch in file #{blob_path}: expected: #{sha1}, got #{actual_sha}"
-      end
-    end
-
-    private
-
-    def actual_sha
-      @actual_sha ||= Digest::SHA1.file(blob_path).hexdigest
-    end
-  end
-end