bosh-director 1.2905.0 → 1.2915.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6def001c4329ad3d02e5feeff37da1d51a97cec6
-  data.tar.gz: 564d4bf3e1dfad1e1e0b4814a7a00dcfa48cfe28
+  metadata.gz: 2707ebb2544ad4d8baf7c9db6fc3d0898c9f34f5
+  data.tar.gz: 0693702bcac970f90a94bf9b5930f956bc14c339
 SHA512:
-  metadata.gz: 964977ba089ecbc0a2f889da0cd577ae7fa38370f82a9f3edd44f2ba10e97ce234f77ba543d2df750cc799486c61355c6e3083343b3d68533097e8acadc9ed08
-  data.tar.gz: 7b3eebd5a9f3da5fd6308a8b051f9a81860a5535de308b593f687d6d02a569db4b193a5c49c6a5f3740f6255250ccd614efba4d03f24dd493601389dedeee58a
+  metadata.gz: 037437f2a42d47c8ddc99623e48e952f649dab2dd2e114c9e57c999e73b67098d52bc2ee1f0bc0ae56598240b6eb3e01a29bc838e3ede330504c0e57f0258f55
+  data.tar.gz: 8f5d470c563313bc2e8808800d83dd2de013a3e7c9f29b68d9ddf34515c49566892b191183f6d079bc4d2ca2a825204b6b3f5c7a9b0b5e80e95f39dc7f6d0d02

data/db/migrations/director/20150331002413_add_cloud_configs.rb

@@ -0,0 +1,19 @@
+Sequel.migration do
+  change do
+    adapter_scheme =  self.adapter_scheme
+
+    create_table :cloud_configs do
+      primary_key :id
+
+      if [:mysql2, :mysql].include?(adapter_scheme)
+        longtext :properties
+      else
+        text :properties
+      end
+
+      Time :created_at, null: false
+
+      index :created_at
+    end
+  end
+end

data/db/migrations/director/20150401184803_add_cloud_config_to_deployments.rb

@@ -0,0 +1,7 @@
+Sequel.migration do
+  change do
+    alter_table(:deployments) do
+      add_foreign_key :cloud_config_id, :cloud_configs
+    end
+  end
+end

data/lib/bosh/director.rb

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh
   module Director
   end
@@ -152,5 +150,6 @@ require 'bosh/director/api/controllers/tasks_controller'
 require 'bosh/director/api/controllers/task_controller'
 require 'bosh/director/api/controllers/users_controller'
 require 'bosh/director/api/controllers/compiled_packages_controller'
+require 'bosh/director/api/controllers/cloud_configs_controller'
 require 'bosh/director/api/controllers/locks_controller'
 require 'bosh/director/api/route_configuration'

data/lib/bosh/director/api.rb

@@ -25,6 +25,7 @@ require 'bosh/director/api/user_manager'
 require 'bosh/director/api/vm_state_manager'
 require 'bosh/director/api/backup_manager'
 require 'bosh/director/api/resurrector_manager'
+require 'bosh/director/api/cloud_config_manager'
 
 require 'bosh/director/api/instance_lookup'
 require 'bosh/director/api/deployment_lookup'

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

@@ -0,0 +1,22 @@
+module Bosh
+  module Director
+    module Api
+      class CloudConfigManager
+        def update(cloud_config_yaml)
+          cloud_config = Bosh::Director::Models::CloudConfig.new(
+            properties: cloud_config_yaml
+          )
+          cloud_config.save
+        end
+
+        def list(limit)
+          Bosh::Director::Models::CloudConfig.order(Sequel.desc(:created_at)).limit(limit).to_a
+        end
+
+        def latest
+          list(1).first
+        end
+      end
+    end
+  end
+end

data/lib/bosh/director/api/controllers/base_controller.rb

@@ -14,8 +14,8 @@ module Bosh::Director
           @backup_manager = BackupManager.new
           @instance_manager = InstanceManager.new
           @resurrector_manager = ResurrectorManager.new
-          @problem_manager = ProblemManager.new
-          @property_manager = PropertyManager.new
+          @problem_manager = ProblemManager.new(@deployment_manager)
+          @property_manager = PropertyManager.new(@deployment_manager)
           @release_manager = ReleaseManager.new
           @snapshot_manager = SnapshotManager.new
           @stemcell_manager = StemcellManager.new

data/lib/bosh/director/api/controllers/cloud_configs_controller.rb

@@ -0,0 +1,40 @@
+require 'bosh/director/api/controllers/base_controller'
+
+module Bosh::Director
+  module Api::Controllers
+    class CloudConfigsController < BaseController
+      post '/', :consumes => :yaml do
+        properties = request.body.string
+        Bosh::Director::Api::CloudConfigManager.new.update(properties)
+
+        status(201)
+      end
+
+      get '/' do
+        if params['limit'].nil? || params['limit'].empty?
+          status(400)
+          body("limit is required")
+          return
+        end
+
+        begin
+          limit = Integer(params['limit'])
+        rescue ArgumentError
+          status(400)
+          body("limit is invalid: '#{params['limit']}' is not an integer")
+          return
+        end
+
+        cloud_configs = Bosh::Director::Api::CloudConfigManager.new.list(limit)
+        json_encode(
+          cloud_configs.map do |cloud_config|
+            {
+              "properties" => cloud_config.properties,
+              "created_at" => cloud_config.created_at,
+            }
+        end
+        )
+      end
+    end
+  end
+end

data/lib/bosh/director/api/controllers/deployments_controller.rb

@@ -43,7 +43,8 @@ module Bosh::Director
         # we get the deployment here even though it isn't used here, to make sure
         # the call returns a 404 if the deployment doesn't exist
         @deployment_manager.find_by_name(params[:deployment])
-        task = @deployment_manager.create_deployment(@user, request.body, options)
+        latest_cloud_config = Bosh::Director::Api::CloudConfigManager.new.latest
+        task = @deployment_manager.create_deployment(@user, request.body, latest_cloud_config, options)
         redirect "/tasks/#{task.id}"
       end
 
@@ -67,7 +68,8 @@ module Bosh::Director
 
         deployment = @deployment_manager.find_by_name(params[:deployment])
         manifest = request.content_length.nil? ? StringIO.new(deployment.manifest) : request.body
-        task = @deployment_manager.create_deployment(@user, manifest, options)
+        latest_cloud_config = Bosh::Director::Api::CloudConfigManager.new.latest
+        task = @deployment_manager.create_deployment(@user, manifest, latest_cloud_config, options)
         redirect "/tasks/#{task.id}"
       end
 
@@ -253,8 +255,9 @@ module Bosh::Director
       post '/', :consumes => :yaml do
         options = {}
         options['recreate'] = true if params['recreate'] == 'true'
+        latest_cloud_config = Bosh::Director::Api::CloudConfigManager.new.latest
 
-        task = @deployment_manager.create_deployment(@user, request.body, options)
+        task = @deployment_manager.create_deployment(@user, request.body, latest_cloud_config, options)
         redirect "/tasks/#{task.id}"
       end
 

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

@@ -11,7 +11,7 @@ module Bosh::Director
         DeploymentLookup.new.by_name(name)
       end
 
-      def create_deployment(username, deployment_manifest, options = {})
+      def create_deployment(username, deployment_manifest, cloud_config, options = {})
         random_name = "deployment-#{SecureRandom.uuid}"
         deployment_manifest_dir = Dir::tmpdir
         deployment_manifest_file = File.join(deployment_manifest_dir, random_name)
@@ -22,7 +22,8 @@ module Bosh::Director
 
         write_file(deployment_manifest_file, deployment_manifest)
 
-        JobQueue.new.enqueue(username, Jobs::UpdateDeployment, 'create deployment', [deployment_manifest_file, options])
+        cloud_config_id = cloud_config.nil? ? nil : cloud_config.id
+        JobQueue.new.enqueue(username, Jobs::UpdateDeployment, 'create deployment', [deployment_manifest_file, cloud_config_id, options])
       end
 
       def delete_deployment(username, deployment, options = {})

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

@@ -2,7 +2,7 @@ module Bosh::Director
   module Api
     class ProblemManager
 
-      def initialize(deployment_manager = DeploymentManager.new)
+      def initialize(deployment_manager)
         @deployment_manager = deployment_manager
       end
 

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

@@ -4,8 +4,8 @@ module Bosh::Director
   module Api
     class PropertyManager
 
-      def initialize
-        @deployment_manager = DeploymentManager.new
+      def initialize(deployment_manager)
+        @deployment_manager = deployment_manager
       end
 
       def create_property(deployment_name, property_name, value)

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

@@ -10,10 +10,15 @@ module Bosh
         def controllers
           director_app = Bosh::Director::App.new(@config)
           controllers = {}
-          controllers['/info'] = Bosh::Director::Api::Controllers::InfoController.new(@config)
-          controllers['/tasks'] = Bosh::Director::Api::Controllers::TasksController.new(@config)
           controllers['/backups'] = Bosh::Director::Api::Controllers::BackupsController.new(@config)
+          controllers['/cloud_configs'] = Bosh::Director::Api::Controllers::CloudConfigsController.new(@config)
+          controllers['/compiled_package_groups'] = Bosh::Director::Api::Controllers::CompiledPackagesController.new(
+            @config,
+            Bosh::Director::Api::CompiledPackageGroupManager.new
+          )
           controllers['/deployments'] = Bosh::Director::Api::Controllers::DeploymentsController.new(@config)
+          controllers['/info'] = Bosh::Director::Api::Controllers::InfoController.new(@config)
+          controllers['/locks'] = Bosh::Director::Api::Controllers::LocksController.new(@config)
           controllers['/packages'] = Bosh::Director::Api::Controllers::PackagesController.new(@config)
           controllers['/releases'] = Bosh::Director::Api::Controllers::ReleasesController.new(@config)
           controllers['/resources'] = Bosh::Director::Api::Controllers::ResourcesController.new(
@@ -23,12 +28,8 @@ module Bosh
           controllers['/resurrection'] = Bosh::Director::Api::Controllers::ResurrectionController.new(@config)
           controllers['/stemcells'] = Bosh::Director::Api::Controllers::StemcellsController.new(@config)
           controllers['/task'] = Bosh::Director::Api::Controllers::TaskController.new(@config)
+          controllers['/tasks'] = Bosh::Director::Api::Controllers::TasksController.new(@config)
           controllers['/users'] = Bosh::Director::Api::Controllers::UsersController.new(@config)
-          controllers['/compiled_package_groups'] = Bosh::Director::Api::Controllers::CompiledPackagesController.new(
-            @config,
-            Bosh::Director::Api::CompiledPackageGroupManager.new
-          )
-          controllers['/locks'] = Bosh::Director::Api::Controllers::LocksController.new(@config)
           controllers
         end
       end

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

@@ -13,7 +13,7 @@ module Bosh::Director
 
       # @param [String] manifest_file Path to deployment manifest
       # @param [Hash] options Deployment options
-      def initialize(manifest_file, options = {})
+      def initialize(manifest_file, cloud_config_id, options = {})
         @blobstore = App.instance.blobstores.blobstore
 
         logger.info('Reading deployment manifest')
@@ -21,6 +21,9 @@ module Bosh::Director
         @manifest = File.read(@manifest_file)
         logger.debug("Manifest:\n#{@manifest}")
 
+        @cloud_config = Bosh::Director::Models::CloudConfig.find(id: cloud_config_id)
+        logger.debug("Cloud Config:\n#{@cloud_config.inspect}")
+
         logger.info('Creating deployment plan')
         logger.info("Deployment plan options: #{options.pretty_inspect}")
 
@@ -99,6 +102,7 @@ module Bosh::Director
             end
 
             deployment.manifest = @manifest
+            deployment.cloud_config = @cloud_config
             deployment.save
             notifier.send_end_event
             logger.info('Finished updating deployment')

data/lib/bosh/director/lock.rb

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
 
   # Distributed lock backed by Redis.

data/lib/bosh/director/models.rb

@@ -1,10 +1,12 @@
 # Copyright (c) 2009-2012 VMware, Inc.
 #
 
+require 'bosh/director/models/cloud_config'
 require 'bosh/director/models/compiled_package'
 require 'bosh/director/models/deployment'
 require 'bosh/director/models/deployment_problem'
 require 'bosh/director/models/deployment_property'
+require 'bosh/director/models/director_attribute'
 require 'bosh/director/models/instance'
 require 'bosh/director/models/log_bundle'
 require 'bosh/director/models/package'
@@ -17,7 +19,6 @@ require 'bosh/director/models/template'
 require 'bosh/director/models/user'
 require 'bosh/director/models/vm'
 require 'bosh/director/models/persistent_disk'
-require 'bosh/director/models/director_attribute'
 require 'bosh/director/models/rendered_templates_archive'
 
 module Bosh::Director

data/lib/bosh/director/models/cloud_config.rb

@@ -0,0 +1,11 @@
+module Bosh
+  module Director
+    module Models
+      class CloudConfig < Sequel::Model(Bosh::Director::Config.db)
+        def before_create
+          self.created_at ||= Time.now
+        end
+      end
+    end
+  end
+end

data/lib/bosh/director/models/deployment.rb

@@ -9,6 +9,7 @@ module Bosh::Director::Models
     one_to_many  :vms
     one_to_many  :properties, :class => "Bosh::Director::Models::DeploymentProperty"
     one_to_many  :problems, :class => "Bosh::Director::Models::DeploymentProblem"
+    many_to_one   :cloud_config
 
     def validate
       validates_presence :name

data/lib/bosh/director/problem_handlers/missing_vm.rb

@@ -5,6 +5,7 @@ module Bosh::Director
     class MissingVM < Base
 
       register_as :missing_vm
+      auto_resolution :recreate_vm
 
       def initialize(vm_id, data)
         super

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.2905.0'
+    VERSION = '1.2915.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2905.0
+  version: 1.2915.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -30,140 +30,140 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2905.0
+        version: 1.2915.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2905.0
+        version: 1.2915.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2905.0
+        version: 1.2915.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2905.0
+        version: 1.2915.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2905.0
+        version: 1.2915.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2905.0
+        version: 1.2915.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2905.0
+        version: 1.2915.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2905.0
+        version: 1.2915.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2905.0
+        version: 1.2915.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2905.0
+        version: 1.2915.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2905.0
+        version: 1.2915.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2905.0
+        version: 1.2915.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2905.0
+        version: 1.2915.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2905.0
+        version: 1.2915.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2905.0
+        version: 1.2915.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2905.0
+        version: 1.2915.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2905.0
+        version: 1.2915.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2905.0
+        version: 1.2915.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -558,7 +558,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH Director
-  327a58
+  5653ce
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -611,6 +611,8 @@ files:
 - db/migrations/director/20150102234124_denormalize_task_user_id_to_task_username.rb
 - db/migrations/director/20150223222605_increase_manifest_text_limit.rb
 - db/migrations/director/20150224193313_use_larger_text_types.rb
+- db/migrations/director/20150331002413_add_cloud_configs.rb
+- db/migrations/director/20150401184803_add_cloud_config_to_deployments.rb
 - db/migrations/dns/20120123234908_initial.rb
 - lib/bosh/director.rb
 - lib/bosh/director/agent_client.rb
@@ -618,9 +620,11 @@ files:
 - lib/bosh/director/api.rb
 - lib/bosh/director/api/api_helper.rb
 - lib/bosh/director/api/backup_manager.rb
+- lib/bosh/director/api/cloud_config_manager.rb
 - lib/bosh/director/api/compiled_package_group_manager.rb
 - lib/bosh/director/api/controllers/backups_controller.rb
 - lib/bosh/director/api/controllers/base_controller.rb
+- lib/bosh/director/api/controllers/cloud_configs_controller.rb
 - lib/bosh/director/api/controllers/compiled_packages_controller.rb
 - lib/bosh/director/api/controllers/deployments_controller.rb
 - lib/bosh/director/api/controllers/info_controller.rb
@@ -757,6 +761,7 @@ files:
 - lib/bosh/director/log_bundles_cleaner.rb
 - lib/bosh/director/logs_fetcher.rb
 - lib/bosh/director/models.rb
+- lib/bosh/director/models/cloud_config.rb
 - lib/bosh/director/models/compiled_package.rb
 - lib/bosh/director/models/deployment.rb
 - lib/bosh/director/models/deployment_problem.rb