bosh-director 1.1761.0 → 1.1777.0

data/bin/bosh-director

@@ -5,8 +5,8 @@ require 'thin'
 
 config_file = nil
 
-opts = OptionParser.new do |opts|
-  opts.on('-c', '--config [ARG]', 'Configuration File') do |opt|
+opts = OptionParser.new do |op|
+  op.on('-c', '--config [ARG]', 'Configuration File') do |opt|
     config_file = opt
   end
 end
@@ -18,9 +18,9 @@ config = Bosh::Director::Config.load_file(config_file)
 
 Bosh::Director::App.new(config)
 
-thin_server = Thin::Server.new('127.0.0.1', config.hash['port'], :signals => false) do
+thin_server = Thin::Server.new('127.0.0.1', config.hash['port'], signals: false) do
   use Rack::CommonLogger
-  map "/" do
+  map '/' do
     run Bosh::Director::Api::Controller.new
   end
 end

data/bin/bosh-director-console

@@ -1,17 +1,27 @@
 #!/usr/bin/env ruby
 
-APP_DIR = File.expand_path(File.join("..", ".."), __FILE__)
+APP_DIR = File.expand_path(File.join('..', '..'), __FILE__)
 
-DEFAULT_DIRECTOR_CONFIG = File.join(APP_DIR, "config", "bosh-director.yml")
-
-require 'bosh/director'
 require 'irb'
 require 'irb/completion'
+require 'bosh/director'
 require 'rack/test'
 
+options = {}
+
+OptionParser.new do |opt|
+  opt.banner = 'Usage: director_console [options]'
+  opt.on('-c', '--config [ARG]', 'configuration file') { |v| options[:config] = v }
+  opt.parse!(ARGV)
+end
+
+config_file = File.join(APP_DIR, 'config', 'bosh-director.yml')
+if options[:config]
+  config_file = File.expand_path(options[:config])
+end
+
 module Bosh
   module Director
-
     class TestApplication
       include Rack::Test::Methods
 
@@ -21,45 +31,27 @@ module Bosh
     end
 
     class Console
-      def self.start(context)
-        new.start(context)
-      end
-
-      def start(context)
-        options = {}
-
-        OptionParser.new do |opt|
-          opt.banner = "Usage: director_console [options]"
-          opt.on('-c', '--config [ARG]', 'configuration file') { |v| options[:config] = v }
-          opt.parse!(ARGV)
-        end
-
-        if options[:config]
-          config_file = File.expand_path(options[:config])
-        else
-          config_file = DEFAULT_DIRECTOR_CONFIG
-        end
-
+      def start(context, config_file)
         puts "=> Loading #{config_file}"
-        Bosh::Director::App.new(Bosh::Director::Config.load_file(config_file))
-
-        context.instance_eval do
-          include BD::Models
-        end
+        config = Bosh::Director::Config.load_file(config_file)
+        Bosh::Director::App.new(config)
 
-        begin
-          require 'ruby-debug'
-          puts "=> Debugger enabled"
-        rescue LoadError
-          puts "=> ruby-debug not found, debugger disabled"
-        end
+        context.instance_eval { include BD::Models }
+        require_ruby_debug
 
         puts "=> Welcome to BOSH Director console\n=> You can use 'app' to access REST API"
         puts "=> You can also use 'cloud', 'blobstore', 'nats' helpers to query these services"
-
         IRB.start
       end
 
+      private
+
+      def require_ruby_debug
+        require 'ruby-debug'
+        puts '=> Debugger enabled'
+      rescue LoadError
+        puts '=> ruby-debug not found, debugger disabled'
+      end
     end
   end
 end
@@ -80,5 +72,4 @@ end
   end
 end
 
-BD::Console.start(self)
-
+BD::Console.new.start(self, config_file)

data/bin/bosh-director-drain-workers

@@ -1,23 +1,23 @@
 #!/usr/bin/env ruby
 
-require "bosh/director"
+require 'bosh/director'
 
 config_file = nil
 report = false
 active_worker = 1
 
-opts = OptionParser.new do |opts|
-  opts.on("-c", "--config [ARG]", "Configuration File") do |opt|
+opts = OptionParser.new do |op|
+  op.on('-c', '--config [ARG]', 'Configuration File') do |opt|
     config_file = opt
   end
-  opts.on("-r", "--report", "Report 1 if any active worker, 0 otherwise") do |opt|
+  op.on('-r', '--report', 'Report 1 if any active worker, 0 otherwise') do
     report = true
   end
 end
 
 opts.parse!(ARGV.dup)
 
-config_file ||= ::File.expand_path("../../config/bosh-director.yml", __FILE__)
+config_file ||= ::File.expand_path('../../config/bosh-director.yml', __FILE__)
 config = Bosh::Director::Config.load_file(config_file)
 
 Bosh::Director::App.new(config)
@@ -25,16 +25,17 @@ Bosh::Director::App.new(config)
 logger = Bosh::Director::Config.logger
 
 loop do
-  logger.info("Checking for any workers that are still processing..")
-  worker = Resque::Worker.all.find { |worker| worker.working? }
+  logger.info('Checking for any workers that are still processing..')
+
+  worker = Resque::Worker.all.find(&:working?)
   if worker.nil?
     active_worker = 0
-    logger.info("All workers are idle")
-    break
-  end
-  if report
+    logger.info('All workers are idle')
     break
   end
+
+  break if report
+
   logger.info("Found worker: #{worker}, sleeping for 60 seconds.")
   sleep 60
 end

data/bin/bosh-director-migrate

@@ -1,14 +1,14 @@
 #!/usr/bin/env ruby
 
-require "logger"
-require "sequel"
-require "bosh/director"
-require "optparse"
+require 'logger'
+require 'sequel'
+require 'bosh/director'
+require 'optparse'
 
 config_file = nil
 
-opts = OptionParser.new do |opts|
-  opts.on("-c", "--config FILE", "configuration file") do |opt|
+opts = OptionParser.new do |op|
+  op.on('-c', '--config FILE', 'configuration file') do |opt|
     config_file = opt
   end
 end
@@ -21,11 +21,11 @@ if config_file.nil?
 end
 
 config = Psych.load_file(config_file)
-unless config["db"] && config["db"]["database"]
-  abort ("Director database config missing from config file")
+unless config['db'] && config['db']['database']
+  abort ('Director database config missing from config file')
 end
 
-db = Bosh::Director::Config.configure_db(config["db"])
+db = Bosh::Director::Config.configure_db(config['db'])
 
 def migrate(database, schema_table, dir, target = nil)
   options = {}
@@ -36,21 +36,20 @@ def migrate(database, schema_table, dir, target = nil)
   Sequel::TimestampMigrator.new(database, dir, options).run
 end
 
-migrations_dir = File.expand_path("../../db/migrations/director", __FILE__)
+migrations_dir = File.expand_path('../../db/migrations/director', __FILE__)
 
 migrate(db, nil, migrations_dir)
 
-if config["dns"] && config["dns"]["db"]
-  dns_migrations_dir = File.expand_path("../../db/migrations/dns", __FILE__)
-  dns_db = Bosh::Director::Config.configure_db(config["dns"]["db"])
-  migrate(dns_db, "dns_schema",
-          dns_migrations_dir)
+if config['dns'] && config['dns']['db']
+  dns_migrations_dir = File.expand_path('../../db/migrations/dns', __FILE__)
+  dns_db = Bosh::Director::Config.configure_db(config['dns']['db'])
+  migrate(dns_db, 'dns_schema', dns_migrations_dir)
 end
 
-cpi = config["cloud"]["plugin"]
-require_path = File.join("cloud", cpi)
+cpi = config['cloud']['plugin']
+require_path = File.join('cloud', cpi)
 cpi_path = $LOAD_PATH.find { |p| File.exist?(File.join(p, require_path)) }
-migrations = File.expand_path("../db/migrations", cpi_path)
+migrations = File.expand_path('../db/migrations', cpi_path)
 
 if File.directory?(migrations)
   migrate(db, "#{cpi}_cpi_schema", migrations)

data/bin/bosh-director-scheduler

@@ -5,8 +5,8 @@ require 'bosh/director/scheduler'
 
 config_file = ::File.expand_path('../../config/bosh-director.yml', __FILE__)
 
-opts = OptionParser.new do |opts|
-  opts.on('-c', '--config [ARG]', 'Configuration File') do |opt|
+opts = OptionParser.new do |op|
+  op.on('-c', '--config [ARG]', 'Configuration File') do |opt|
     config_file = opt
   end
 end

data/bin/bosh-director-worker

@@ -1,29 +1,29 @@
 #!/usr/bin/env ruby
 
-require "erb"
-require "bosh/director"
+require 'erb'
+require 'bosh/director'
 
 config_file = nil
 index = nil
 erb = false
 
-opts = OptionParser.new do |opts|
-  opts.on("-c", "--config [ARG]", "Configuration File") do |opt|
+opts = OptionParser.new do |op|
+  op.on('-c', '--config [ARG]', 'Configuration File') do |opt|
     config_file = opt
   end
 
-  opts.on("-i", "--index [ARG]", Integer, "Worker Index") do |opt|
+  op.on('-i', '--index [ARG]', Integer, 'Worker Index') do |opt|
     index = opt
   end
 
-  opts.on("-e", "--[no-]erb", "Treat Configuration as ERB Template") do |opt|
+  op.on('-e', '--[no-]erb', 'Treat Configuration as ERB Template') do |opt|
     erb = opt
   end
 end
 
 opts.parse!(ARGV.dup)
 
-config_file ||= ::File.expand_path("../../config/bosh-director.yml", __FILE__)
+config_file ||= ::File.expand_path('../../config/bosh-director.yml', __FILE__)
 config = nil
 
 # Is this code even used anymore?
@@ -40,7 +40,7 @@ if erb
     end
   end
 
-  template = ERB.new(File.read(config_file), 0, "%<>-")
+  template = ERB.new(File.read(config_file), 0, '%<>-')
   contents = template.result(ConfigBindingHelper.new(index).get_binding)
   config_hash = Psych.load(contents)
   config = Bosh::Director::Config.load_hash(config_hash)
@@ -63,11 +63,11 @@ begin
   worker = Resque::Worker.new(*queues)
   worker.term_child = true
 rescue Resque::NoQueueError
-  abort "set QUEUE env var, e.g. $ QUEUE=critical,high rake resque:work"
+  abort 'set QUEUE env var, e.g. $ QUEUE=critical,high rake resque:work'
 end
 
 Resque.after_fork do
-  EM.error_handler{ |e| puts "Error raised during event loop: #{e.message}" }
+  EM.error_handler { |e| puts "Error raised during event loop: #{e.message}" }
   Thread.new { EM.run }
 end
 

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.1761.0'
+    VERSION = '1.1777.0'
   end
 end

data/lib/cloud/dummy.rb

@@ -8,12 +8,12 @@ module Bosh
       class NotImplemented < StandardError; end
 
       def initialize(options)
-        if options["dir"].nil?
-          raise ArgumentError, "please provide base directory for dummy cloud"
+        if options['dir'].nil?
+          raise ArgumentError, 'please provide base directory for dummy cloud'
         end
 
         @options = options
-        @base_dir = options["dir"]
+        @base_dir = options['dir']
 
         FileUtils.mkdir_p(@base_dir)
       rescue Errno::EACCES
@@ -30,64 +30,44 @@ module Bosh
         FileUtils.rm(stemcell_file(stemcell_cid))
       end
 
-      def blobstore
-        @options['agent']['blobstore']
-      end
-
-      def nats_uri
-        @options['nats']
-      end
-
+      # rubocop:disable ParameterLists
       def create_vm(agent_id, stemcell, resource_pool, networks, disk_locality = nil, env = nil)
-        agent_base_dir = "#{@options['dir']}/agent-base-dir-#{agent_id}"
-
-        root_dir = File.join(agent_base_dir, 'root_dir')
+      # rubocop:enable ParameterLists
+        root_dir = File.join(agent_base_dir(agent_id), 'root_dir')
         FileUtils.mkdir_p(File.join(root_dir, 'etc', 'logrotate.d'))
 
-        # FIXME: if there is a need to start this dummy cloud agent with alerts turned on
-        # then port should be overriden for each agent, otherwise all but first won't start
-        # (won't be able to bind to port)
-        write_agent_settings(agent_base_dir, agent_id, nats_uri)
-        agent_cmd = %W[bosh_agent -b #{agent_base_dir} -r #{root_dir} --no-alerts -I dummy]
-        agent_log = "#{@options['dir']}/agent.#{agent_id}.log"
-        agent_pid = Process.spawn(*agent_cmd, chdir: agent_base_dir, out: agent_log, err: agent_log)
+        write_agent_settings(agent_id, {
+          agent_id: agent_id,
+          blobstore: @options['agent']['blobstore'],
+          ntp: [],
+          disks: { persistent: {} },
+          vm: { name: "vm-#{agent_id}" },
+          mbus: @options['nats'],
+        })
 
+        agent_cmd = agent_cmd(agent_id, root_dir, :ruby)
+        agent_log = "#{@options['dir']}/agent.#{agent_id}.log"
+        agent_pid = Process.spawn(*agent_cmd, chdir: agent_base_dir(agent_id), out: agent_log, err: agent_log)
         Process.detach(agent_pid)
 
-        FileUtils.mkdir_p(File.join(@base_dir, "running_vms"))
-        FileUtils.touch(vm_file(agent_pid))
+        FileUtils.mkdir_p(File.join(@base_dir, 'running_vms'))
+        File.write(vm_file(agent_pid), agent_id)
 
         agent_pid.to_s
       end
 
-      def write_agent_settings(agent_base_dir, agent_id, nats_uri)
-        FileUtils.mkdir_p(File.join(agent_base_dir, 'bosh'))
-        settings = {
-          agent_id: agent_id,
-          blobstore: @options['agent']['blobstore'],
-          ntp: [],
-          disks: {
-            persistent: {},
-          },
-          vm: {
-            name: "vm-#{agent_id}"
-          },
-          mbus: nats_uri,
-        }
-        File.write(File.join(agent_base_dir, 'bosh', 'settings.json'), JSON.generate(settings))
-      end
-
       def delete_vm(vm_name)
         agent_pid = vm_name.to_i
-        Process.kill("INT", agent_pid)
+        Process.kill('INT', agent_pid)
+      # rubocop:disable HandleExceptions
       rescue Errno::ESRCH
-        # don't care :)
+      # rubocop:enable HandleExceptions
       ensure
-        FileUtils.rm_rf(File.join(@base_dir, "running_vms", vm_name))
+        FileUtils.rm_rf(File.join(@base_dir, 'running_vms', vm_name))
       end
 
       def reboot_vm(vm)
-        raise NotImplemented, "Dummy CPI does not implement reboot_vm"
+        raise NotImplemented, 'Dummy CPI does not implement reboot_vm'
       end
 
       def has_vm?(vm_id)
@@ -95,17 +75,27 @@ module Bosh
       end
 
       def configure_networks(vm, networks)
-        raise NotImplemented, "Dummy CPI does not implement configure_networks"
+        raise NotImplemented, 'Dummy CPI does not implement configure_networks'
       end
 
       def attach_disk(vm_id, disk_id)
         file = attachment_file(vm_id, disk_id)
         FileUtils.mkdir_p(File.dirname(file))
         FileUtils.touch(file)
+
+        agent_id = agent_id_for_vm_id(vm_id)
+        settings = read_agent_settings(agent_id)
+        settings['disks']['persistent'][disk_id] = 'attached'
+        write_agent_settings(agent_id, settings)
       end
 
       def detach_disk(vm_id, disk_id)
         FileUtils.rm(attachment_file(vm_id, disk_id))
+
+        agent_id = agent_id_for_vm_id(vm_id)
+        settings = read_agent_settings(agent_id)
+        settings['disks']['persistent'].delete(disk_id)
+        write_agent_settings(agent_id, settings)
       end
 
       def create_disk(size, vm_locality = nil)
@@ -133,29 +123,58 @@ module Bosh
       end
 
       def validate_deployment(old_manifest, new_manifest)
-        raise NotImplemented, "Dummy CPI does not implement validate_deployment"
+        raise NotImplemented, 'Dummy CPI does not implement validate_deployment'
       end
 
       private
 
+      def agent_id_for_vm_id(vm_id)
+        File.read(vm_file(vm_id))
+      end
+
+      def agent_settings_file(agent_id)
+        File.join(agent_base_dir(agent_id), 'bosh', 'settings.json')
+      end
+
+      def agent_base_dir(agent_id)
+        "#{@options['dir']}/agent-base-dir-#{agent_id}"
+      end
+
+      def write_agent_settings(agent_id, settings)
+        FileUtils.mkdir_p(File.dirname(agent_settings_file(agent_id)))
+        File.write(agent_settings_file(agent_id), JSON.generate(settings))
+      end
+
+      def agent_cmd(agent_id, root_dir, agent_type)
+        go_agent_exe = File.absolute_path('bosh/go_agent/out/bosh-agent')
+        {
+          ruby: %W[bosh_agent      -b #{agent_base_dir(agent_id)} -I dummy -r #{root_dir} --no-alerts],
+          go:   %W[#{go_agent_exe} -b #{agent_base_dir(agent_id)} -I dummy -P dummy -M dummy],
+        }[agent_type]
+      end
+
+      def read_agent_settings(agent_id)
+        JSON.parse(File.read(agent_settings_file(agent_id)))
+      end
+
       def stemcell_file(stemcell_id)
         File.join(@base_dir, "stemcell_#{stemcell_id}")
       end
 
       def vm_file(vm_id)
-        File.join(@base_dir, "running_vms", vm_id.to_s)
+        File.join(@base_dir, 'running_vms', vm_id.to_s)
       end
 
       def disk_file(disk_id)
-        File.join(@base_dir, "disks", disk_id)
+        File.join(@base_dir, 'disks', disk_id)
       end
 
       def attachment_file(vm_id, disk_id)
-        File.join(@base_dir, "attachments", vm_id, disk_id)
+        File.join(@base_dir, 'attachments', vm_id, disk_id)
       end
 
       def snapshot_file(snapshot_id)
-        File.join(@base_dir, "snapshots", snapshot_id)
+        File.join(@base_dir, 'snapshots', snapshot_id)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.1761.0
+  version: 1.1777.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1761.0
+        version: 1.1777.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1761.0
+        version: 1.1777.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1761.0
+        version: 1.1777.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1761.0
+        version: 1.1777.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1761.0
+        version: 1.1777.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1761.0
+        version: 1.1777.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1761.0
+        version: 1.1777.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1761.0
+        version: 1.1777.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1761.0
+        version: 1.1777.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1761.0
+        version: 1.1777.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1761.0
+        version: 1.1777.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1761.0
+        version: 1.1777.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1761.0
+        version: 1.1777.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1761.0
+        version: 1.1777.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -461,7 +461,7 @@ dependencies:
         version: '1.0'
 description: ! 'BOSH Director
 
-  826c69'
+  0308a9'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -713,7 +713,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 857401901605478284
+      hash: -2902799239834298514
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23