bosh-director 1.2992.0 → 1.2999.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77b59d978580198275ba946df8f880fcaa6e28b0
-  data.tar.gz: 51860050f654ff925193f6a37034a900cd58eb61
+  metadata.gz: 314dd17fbbb059aaaae50d56efba07c3b0893445
+  data.tar.gz: 89dd10046a5b22f8e1424878c432cfc69f6d51da
 SHA512:
-  metadata.gz: e02624596050a9fc81ecb3dcbbf35f908b20446556967b564211d5f1cdebd0ca7d98372fdd0a1ea04d38a5b074e0adad8cdaebacffb218dfd0ec622c934b7b35
-  data.tar.gz: bc13e1aeb80ea0f6cf1e3d4212891a8db9990c8618a65bcf2267c46eba5fb3a614a367a14bcd2818f5b0aa52bb5a46225466cbec39d617d8aefd796e79e64fb8
+  metadata.gz: 6477ca1a6659b9661203e54493c553fd1e4c61a18f28431b8ccb373273d136c8a967891f86437795bb94555af1d7c80eb9d7eb5faa9a5db52b1e9547c2c708fd
+  data.tar.gz: d492ee6cc46b18579cd1f0094e5b5f35e82b4a986badab2a5b5b7768011c3338c5c424cb60c849a179006087cea79b851dbf32d268f6840696a900870edbc246

data/db/migrations/director/20150619135210_add_os_name_and_version_to_stemcells.rb

@@ -0,0 +1,7 @@
+Sequel.migration do
+  change do
+    alter_table(:stemcells) do
+      add_column :operating_system, String
+    end
+  end
+end

data/lib/bosh/director.rb

@@ -127,6 +127,7 @@ require 'bosh/director/models/helpers/model_helper'
 
 require 'bosh/director/db_backup'
 require 'bosh/director/blobstores'
+require 'bosh/director/api/director_uuid_provider'
 require 'bosh/director/api/local_identity_provider'
 require 'bosh/director/api/uaa_identity_provider'
 require 'bosh/director/app'

data/lib/bosh/director/agent_client.rb

@@ -4,27 +4,35 @@ module Bosh::Director
   class AgentClient
     DEFAULT_POLL_INTERVAL = 1.0
 
+    # in case of timeout errors
+    GET_TASK_MAX_RETRIES = 2
+
+    # get_task should retry at least once because some long running tasks
+    # (e.g. configure_networks) will restart the agent (current implementation)
+    # which most likely will result in first get_task message being lost
+    # because agent was not listening on NATS and second retry message
+    # will probably be received because agent came back up.
+    GET_STATE_MAX_RETRIES = 2
+
     attr_accessor :id
 
     def self.with_defaults(id, options = {})
+      vm = Bosh::Director::Models::Vm.find(:agent_id => id)
+      with_vm(vm, options)
+    end
+
+    def self.with_vm(vm, options = {})
       defaults = {
         retry_methods: {
-          # in case of timeout errors
-          get_state: 2,
-
-          # get_task should retry at least once because some long running tasks
-          # (e.g. configure_networks) will restart the agent (current implementation)
-          # which most likely will result in first get_task message being lost
-          # because agent was not listening on NATS and second retry message
-          # will probably be received because agent came back up.
-          get_task: 2,
+          get_state: GET_STATE_MAX_RETRIES,
+          get_task: GET_TASK_MAX_RETRIES,
         }
       }
 
-      credentials = Bosh::Director::Models::Vm.find(:agent_id => id).credentials
+      credentials = vm.credentials
       defaults.merge!(credentials: credentials) if credentials
 
-      self.new('agent', id, defaults.merge(options))
+      self.new('agent', vm.agent_id, defaults.merge(options))
     end
 
     def initialize(service_name, client_id, options = {})

data/lib/bosh/director/api.rb

@@ -21,7 +21,9 @@ require 'bosh/director/api/snapshot_manager'
 require 'bosh/director/api/stemcell_manager'
 require 'bosh/director/api/compiled_package_group_manager'
 require 'bosh/director/api/task_manager'
-require 'bosh/director/api/user_manager'
+require 'bosh/director/api/user/config_user_manager'
+require 'bosh/director/api/user/database_user_manager'
+require 'bosh/director/api/user/user_manager_provider'
 require 'bosh/director/api/vm_state_manager'
 require 'bosh/director/api/backup_manager'
 require 'bosh/director/api/resurrector_manager'

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

@@ -20,7 +20,6 @@ module Bosh::Director
           @snapshot_manager = SnapshotManager.new
           @stemcell_manager = StemcellManager.new
           @task_manager = TaskManager.new
-          @user_manager = UserManager.new
           @vm_state_manager = VmStateManager.new
           @logger = Config.logger
         end

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

@@ -10,7 +10,7 @@ module Bosh::Director
         status(201)
       end
 
-      get '/', scope: [:read] do
+      get '/', scope: :read do
         if params['limit'].nil? || params['limit'].empty?
           status(400)
           body("limit is required")

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

@@ -137,7 +137,7 @@ module Bosh::Director
         redirect "/tasks/#{task.id}"
       end
 
-      get '/', scope: [:read] do
+      get '/', scope: :read do
         latest_cloud_config = Api::CloudConfigManager.new.latest
         deployments = Models::Deployment.order_by(:name.asc).map do |deployment|
         cloud_config = if deployment.cloud_config.nil?
@@ -169,12 +169,12 @@ module Bosh::Director
         json_encode(deployments)
       end
 
-      get '/:name', scope: [:read] do
+      get '/:name', scope: :read do
         deployment = @deployment_manager.find_by_name(params[:name])
         @deployment_manager.deployment_to_json(deployment)
       end
 
-      get '/:name/vms', scope: [:read] do
+      get '/:name/vms', scope: :read do
         deployment = @deployment_manager.find_by_name(params[:name])
 
         format = params[:format]
@@ -290,7 +290,7 @@ module Bosh::Director
         redirect "/tasks/#{task.id}"
       end
 
-      get '/:deployment_name/errands', scope: [:read] do
+      get '/:deployment_name/errands', scope: :read do
         deployment_plan = load_deployment_plan_without_binding
 
         errands = deployment_plan.jobs.select(&:can_run_as_errand?)

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

@@ -7,7 +7,7 @@ module Bosh::Director
         false
       end
 
-      get '/', scope: [:read] do
+      get '/', scope: :read do
         status = {
           'name' => Config.name,
           'uuid' => Config.uuid,

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

@@ -1,7 +1,7 @@
 module Bosh::Director
   module Api::Controllers
     class LocksController < BaseController
-      get '/', scope: [:read] do
+      get '/', scope: :read do
         redis = Config.redis
 
         locks = []

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

@@ -21,7 +21,7 @@ module Bosh::Director
         redirect "/tasks/#{task.id}"
       end
 
-      get '/', scope: [:read] do
+      get '/', scope: :read do
         releases = Models::Release.order_by(:name.asc).map do |release|
           release_versions = release.versions_dataset.order_by(:version.asc).map do |rv|
             {
@@ -42,7 +42,7 @@ module Bosh::Director
         json_encode(releases)
       end
 
-      get '/:name', scope: [:read] do
+      get '/:name', scope: :read do
         name = params[:name].to_s.strip
         release = @release_manager.find_by_name(name)
 

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

@@ -14,10 +14,11 @@ module Bosh::Director
         redirect "/tasks/#{task.id}"
       end
 
-      get '/', scope: [:read] do
+      get '/', scope: :read do
         stemcells = Models::Stemcell.order_by(:name.asc).map do |stemcell|
           {
             'name' => stemcell.name,
+            'operating_system' => stemcell.operating_system,
             'version' => stemcell.version,
             'cid' => stemcell.cid,
             'deployments' => stemcell.deployments.map { |d| { name: d.name } }

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

@@ -3,7 +3,7 @@ require 'bosh/director/api/controllers/base_controller'
 module Bosh::Director
   module Api::Controllers
     class TasksController < BaseController
-      get '/' do
+      get '/', scope: :read do
         dataset = Models::Task.dataset
 
         if limit = params['limit']
@@ -45,7 +45,7 @@ module Bosh::Director
         json_encode(tasks)
       end
 
-      get '/:id' do
+      get '/:id', scope: :read do
         task = @task_manager.find_task(params[:id])
         if task_timeout?(task)
           task.state = :timeout
@@ -59,7 +59,7 @@ module Bosh::Director
       # Sends back output of given task id and params[:type]
       # Example: `get /tasks/5/output?type=event` will send back the file
       # at /var/vcap/store/director/tasks/5/event
-      get '/:id/output' do
+      get '/:id/output', scope: Api::Extensions::Scoping::ParamsScope.new(:type, {event: :read}) do
         log_type = params[:type] || 'debug'
         task = @task_manager.find_task(params[:id])
 

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

@@ -3,28 +3,45 @@ require 'bosh/director/api/controllers/base_controller'
 module Bosh::Director
   module Api::Controllers
     class UsersController < BaseController
+      def initialize(config)
+        super(config)
+        @identity_provider = config.identity_provider
+      end
+
       post '/', :consumes => [:json] do
-        user = @user_manager.get_user_from_request(request)
-        @user_manager.create_user(user)
+        validate_user_management_support
+
+        user = @identity_provider.get_user_from_request(request)
+        @identity_provider.create_user(user)
         status(204)
         nil
       end
 
       put '/:username', :consumes => [:json] do
-        user = @user_manager.get_user_from_request(request)
+        validate_user_management_support
+
+        user = @identity_provider.get_user_from_request(request)
         if user.username != params[:username]
           raise UserImmutableUsername, 'The username is immutable'
         end
-        @user_manager.update_user(user)
+        @identity_provider.update_user(user)
         status(204)
         nil
       end
 
       delete '/:username' do
-        @user_manager.delete_user(params[:username])
+        validate_user_management_support
+
+        @identity_provider.delete_user(params[:username])
         status(204)
         nil
       end
+
+      def validate_user_management_support
+        unless @identity_provider.supports_api_update?
+          raise UserManagementNotSupported, 'User management is not supported via API'
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,15 @@
+module Bosh
+  module Director
+    module Api
+      class DirectorUUIDProvider
+        def initialize(config)
+          @config = config
+        end
+
+        def uuid
+          @config.uuid
+        end
+      end
+    end
+  end
+end

data/lib/bosh/director/api/extensions/scoping.rb

@@ -13,9 +13,15 @@ module Bosh::Director
           app.helpers(Helpers)
         end
 
-        def scope(*roles)
+        def scope(allowed_scope)
           condition do
-            roles = [settings.default_scope] if roles == [:default]
+            if allowed_scope == :default
+              scope = settings.default_scope
+            elsif allowed_scope.kind_of?(ParamsScope)
+              scope = allowed_scope.scope(params, settings.default_scope)
+            else
+              scope = allowed_scope
+            end
 
             auth_provided = %w(HTTP_AUTHORIZATION X-HTTP_AUTHORIZATION X_HTTP_AUTHORIZATION).detect do |key|
               request.env.has_key?(key)
@@ -23,7 +29,7 @@ module Bosh::Director
 
             if auth_provided
               begin
-                @user = identity_provider.corroborate_user(request.env, roles)
+                @user = identity_provider.corroborate_user(request.env, scope)
               rescue AuthenticationError
               end
             end
@@ -39,6 +45,18 @@ module Bosh::Director
           options[:scope] ||= :default
           super(verb, path, options, &block)
         end
+
+        class ParamsScope
+          def initialize(name, scope)
+            @name = name.to_s
+            @scope = scope
+          end
+
+          def scope(params, default_scope)
+            scope_name = params.fetch(@name, :default).to_sym
+            @scope.fetch(scope_name, default_scope)
+          end
+        end
       end
     end
   end

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

@@ -1,11 +1,19 @@
+require 'forwardable'
+
 module Bosh
   module Director
     module Api
       class LocalIdentityProvider
-        def initialize(*_)
-          @user_manager = Bosh::Director::Api::UserManager.new
+        extend Forwardable
+
+        def initialize(options, _)
+          users = options.fetch('users', [])
+          @user_manager = Bosh::Director::Api::UserManagerProvider.new.user_manager(users)
         end
 
+        # User management is supported for backwards compatibility
+        def_delegators :@user_manager, :supports_api_update?, :create_user, :update_user, :delete_user, :get_user_from_request
+
         def client_info
           {'type' => 'basic', 'options' => {}}
         end

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

@@ -4,13 +4,17 @@ module Bosh
   module Director
     module Api
       class UAAIdentityProvider
-        def initialize(options, director_uuid)
+        def initialize(options, director_uuid_provider)
           @url = options.fetch('url')
           Config.logger.debug "Initializing UAA Identity provider with url #{@url}"
-          @director_uuid = director_uuid
+          @director_uuid_provider = director_uuid_provider
           @token_coder = CF::UAA::TokenCoder.new(skey: options.fetch('symmetric_key', nil), pkey: options.fetch('public_key', nil), scope: [])
         end
 
+        def supports_api_update?
+          false
+        end
+
         def client_info
           {
             'type' => 'uaa',
@@ -38,7 +42,7 @@ module Bosh
               return
             end
 
-            if requested_access.include?(:read) && token_has_read_scope?(token['scope'])
+            if requested_access == :read && token_has_read_scope?(token['scope'])
               return
             end
           end
@@ -47,11 +51,11 @@ module Bosh
         end
 
         def token_has_read_scope?(token_scope)
-          token_scope.include?('bosh.read') || token_scope.include?("bosh.#{@director_uuid}.read")
+          token_scope.include?('bosh.read') || token_scope.include?("bosh.#{@director_uuid_provider.uuid}.read")
         end
 
         def token_has_admin_scope?(token_scope)
-          token_scope.include?('bosh.admin') || token_scope.include?("bosh.#{@director_uuid}.admin")
+          token_scope.include?('bosh.admin') || token_scope.include?("bosh.#{@director_uuid_provider.uuid}.admin")
         end
       end
     end

data/lib/bosh/director/api/user/config_user_manager.rb

@@ -0,0 +1,60 @@
+# Copyright (c) 2009-2012 VMware, Inc.
+
+module Bosh::Director
+  module Api
+    class ConfigUserManager
+      def initialize(users)
+        @users = users
+      end
+
+      def supports_api_update?
+        false
+      end
+
+      # @param [String] name User name
+      def find_by_name(name)
+        user = @users.find { |u| u['name'] == name }
+        if user.nil?
+          raise UserNotFound, "User `#{name}' doesn't exist"
+        end
+        User.new(user)
+      end
+
+      def authenticate(username, password)
+        return false if username.empty? || password.empty?
+
+        user = find_by_name(username)
+        user.password == password
+      rescue UserNotFound
+        false
+      end
+
+      def delete_user(_)
+        raise NotSupported
+      end
+
+      def create_user(_)
+        raise NotSupported
+      end
+
+      def update_user(_)
+        raise NotSupported
+      end
+
+      def get_user_from_request(_)
+        raise NotSupported
+      end
+    end
+
+    private
+
+    class User
+      attr_reader :username, :password
+
+      def initialize(options)
+        @username = options.fetch('name')
+        @password = options.fetch('password')
+      end
+    end
+  end
+end

data/lib/bosh/director/api/{user_manager.rb → user/database_user_manager.rb}

@@ -2,7 +2,7 @@
 
 module Bosh::Director
   module Api
-    class UserManager
+    class DatabaseUserManager
 
       # @param [String] name User name
       # @return [Models::User] User
@@ -14,6 +14,10 @@ module Bosh::Director
         user
       end
 
+      def supports_api_update?
+        true
+      end
+
       def authenticate(username, password)
         # This is a dev-mode shortcut
         if Models::User.count == 0
@@ -50,7 +54,7 @@ module Bosh::Director
       def get_user_from_request(request)
         hash = Yajl::Parser.new.parse(request.body)
         Models::User.new(:username => hash["username"],
-                         :password => hash["password"])
+          :password => hash["password"])
       end
 
       private
@@ -69,4 +73,4 @@ module Bosh::Director
       end
     end
   end
-end
+end

data/lib/bosh/director/api/user/user_manager_provider.rb

@@ -0,0 +1,13 @@
+module Bosh::Director
+  module Api
+    class UserManagerProvider
+      def user_manager(config_users)
+        if config_users.nil? || config_users.empty?
+          DatabaseUserManager.new
+        else
+          ConfigUserManager.new(config_users)
+        end
+      end
+    end
+  end
+end

data/lib/bosh/director/config.rb

@@ -388,7 +388,7 @@ module Bosh::Director
         end
 
         Config.logger.debug("Director configured with '#{provider_name}' user management provider")
-        provider_class.new(user_management['options'] || {}, @uuid)
+        provider_class.new(user_management[provider_name] || {}, Bosh::Director::Api::DirectorUUIDProvider.new(Config))
       end
     end
 

data/lib/bosh/director/errors.rb

@@ -60,6 +60,7 @@ module Bosh::Director
   UserImmutableUsername = err(20001)
   UserInvalid = err(20002)
   UserNameTaken = err(20003)
+  UserManagementNotSupported = err(20004)
 
   ReleaseAlreadyExists = err(30000)
   ReleaseExistingPackageHashMismatch = err(30001)

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

@@ -54,6 +54,7 @@ module Bosh::Director
           stemcell_manifest = Psych.load_file(stemcell_manifest_file)
 
           @name = safe_property(stemcell_manifest, "name", :class => String)
+          @operating_system = safe_property(stemcell_manifest, "operating_system", :class => String, :optional => true)
           @version = safe_property(stemcell_manifest, "version", :class => String)
           @cloud_properties = safe_property(stemcell_manifest, "cloud_properties", :class => Hash, :optional => true)
           @sha1 = safe_property(stemcell_manifest, "sha1", :class => String)
@@ -77,6 +78,7 @@ module Bosh::Director
 
         stemcell = Models::Stemcell.new
         stemcell.name = @name
+        stemcell.operating_system = @operating_system
         stemcell.version = @version
         stemcell.sha1 = @sha1
 

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

@@ -19,7 +19,7 @@ module Bosh::Director
 
       def perform
         @domain = Models::Dns::Domain.find(name: Config.dns_domain_name, type: "NATIVE") if Config.dns_enabled?
-        
+
         vms = Models::Vm.filter(:deployment_id => @deployment_id)
         ThreadPool.new(:max_threads => Config.max_threads).wrap do |pool|
           vms.each do |vm|
@@ -44,7 +44,7 @@ module Bosh::Director
         job_index = nil
 
         begin
-          agent = AgentClient.with_defaults(vm.agent_id, :timeout => TIMEOUT)
+          agent = AgentClient.with_vm(vm, :timeout => TIMEOUT)
           agent_state = agent.get_state(@format)
           agent_state["networks"].each_value do |network|
             ips << network["ip"]

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.2992.0'
+    VERSION = '1.2999.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2992.0
+  version: 1.2999.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -30,126 +30,126 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -572,7 +572,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH Director
-  2996bb
+  321dd5
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -628,6 +628,7 @@ files:
 - db/migrations/director/20150331002413_add_cloud_configs.rb
 - db/migrations/director/20150401184803_add_cloud_config_to_deployments.rb
 - db/migrations/director/20150611193110_add_trusted_certs_sha1_to_vms.rb
+- db/migrations/director/20150619135210_add_os_name_and_version_to_stemcells.rb
 - db/migrations/dns/20120123234908_initial.rb
 - lib/bosh/director.rb
 - lib/bosh/director/agent_client.rb
@@ -654,6 +655,7 @@ files:
 - lib/bosh/director/api/controllers/users_controller.rb
 - lib/bosh/director/api/deployment_lookup.rb
 - lib/bosh/director/api/deployment_manager.rb
+- lib/bosh/director/api/director_uuid_provider.rb
 - lib/bosh/director/api/extensions/scoping.rb
 - lib/bosh/director/api/http_constants.rb
 - lib/bosh/director/api/instance_lookup.rb
@@ -671,7 +673,9 @@ files:
 - lib/bosh/director/api/task_manager.rb
 - lib/bosh/director/api/task_remover.rb
 - lib/bosh/director/api/uaa_identity_provider.rb
-- lib/bosh/director/api/user_manager.rb
+- 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