bosh_cli_plugin_micro 1.5.0.pre.1113 → 1.5.0.pre.1114

data/lib/{deployer → bosh/deployer}/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Deployer
-    VERSION = '1.5.0.pre.1113'
+    VERSION = '1.5.0.pre.1114'
   end
 end

data/lib/bosh/deployer.rb

@@ -0,0 +1,23 @@
+# Copyright (c) 2009-2012 VMware, Inc.
+
+module Bosh; module Deployer; end; end
+
+require 'agent_client'
+require 'fileutils'
+require 'forwardable'
+require 'sequel'
+require 'sequel/adapters/sqlite'
+require 'cloud'
+require 'logger'
+require 'tmpdir'
+require 'securerandom'
+require 'yaml'
+require 'yajl'
+require 'common/common'
+require 'common/thread_formatter'
+
+require 'bosh/deployer/version'
+require 'bosh/deployer/helpers'
+require 'bosh/deployer/config'
+require 'bosh/deployer/specification'
+require 'bosh/deployer/instance_manager'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli_plugin_micro
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1113
+  version: 1.5.0.pre.1114
   prerelease: 6
 platform: ruby
 authors:
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1113
+        version: 1.5.0.pre.1114
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1113
+        version: 1.5.0.pre.1114
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1113
+        version: 1.5.0.pre.1114
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1113
+        version: 1.5.0.pre.1114
 - !ruby/object:Gem::Dependency
   name: agent_client
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1113
+        version: 1.5.0.pre.1114
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1113
+        version: 1.5.0.pre.1114
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1113
+        version: 1.5.0.pre.1114
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1113
+        version: 1.5.0.pre.1114
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1113
+        version: 1.5.0.pre.1114
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1113
+        version: 1.5.0.pre.1114
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1113
+        version: 1.5.0.pre.1114
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1113
+        version: 1.5.0.pre.1114
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1113
+        version: 1.5.0.pre.1114
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1113
+        version: 1.5.0.pre.1114
 - !ruby/object:Gem::Dependency
   name: rspec-fire
   requirement: !ruby/object:Gem::Requirement
@@ -173,7 +173,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH CLI plugin for Micro BOSH deployment
 
-  cfd471'
+  e0c472'
 email: support@cloudfoundry.com
 executables: []
 extensions: []
@@ -184,17 +184,20 @@ files:
 - config/vcloud_defaults.yml
 - config/vsphere_defaults.yml
 - lib/bosh/cli/commands/micro.rb
-- lib/deployer.rb
-- lib/deployer/config.rb
-- lib/deployer/helpers.rb
-- lib/deployer/instance_manager.rb
-- lib/deployer/instance_manager/aws.rb
-- lib/deployer/instance_manager/openstack.rb
-- lib/deployer/instance_manager/vcloud.rb
-- lib/deployer/instance_manager/vsphere.rb
-- lib/deployer/models/instance.rb
-- lib/deployer/specification.rb
-- lib/deployer/version.rb
+- lib/bosh/deployer.rb
+- lib/bosh/deployer/config.rb
+- lib/bosh/deployer/configuration.rb
+- lib/bosh/deployer/director_gateway_error.rb
+- lib/bosh/deployer/helpers.rb
+- lib/bosh/deployer/instance_manager.rb
+- lib/bosh/deployer/instance_manager/aws.rb
+- lib/bosh/deployer/instance_manager/openstack.rb
+- lib/bosh/deployer/instance_manager/vcloud.rb
+- lib/bosh/deployer/instance_manager/vsphere.rb
+- lib/bosh/deployer/logger_renderer.rb
+- lib/bosh/deployer/models/instance.rb
+- lib/bosh/deployer/specification.rb
+- lib/bosh/deployer/version.rb
 - README.rdoc
 homepage: https://github.com/cloudfoundry/bosh
 licenses:

data/lib/deployer/config.rb

@@ -1,157 +0,0 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
-module Bosh; end
-
-module Bosh::Deployer
-  class Config
-
-    class << self
-
-      include Helpers
-
-      attr_accessor :logger, :db, :uuid, :resources, :cloud_options,
-        :spec_properties, :agent_properties, :bosh_ip, :env, :name, :net_conf
-
-      def configure(config)
-        plugin = cloud_plugin(config)
-
-        config = deep_merge(load_defaults(plugin), config)
-
-        @base_dir = config["dir"]
-        FileUtils.mkdir_p(@base_dir)
-
-        @name = config["name"]
-        @cloud_options = config["cloud"]
-        @net_conf = config["network"]
-        @bosh_ip = @net_conf["ip"]
-        @resources = config["resources"]
-        @env = config["env"]
-
-        @logger = Logger.new(config["logging"]["file"] || STDOUT)
-        @logger.level = Logger.const_get(config["logging"]["level"].upcase)
-        @logger.formatter = ThreadFormatter.new
-
-        apply_spec = config["apply_spec"]
-        @spec_properties = apply_spec["properties"]
-        @agent_properties = apply_spec["agent"]
-
-        @db = Sequel.sqlite
-
-        migrate_cpi
-
-        @db.create_table :instances do
-          primary_key :id
-          column :name, :text, :unique => true, :null => false
-          column :uuid, :text
-          column :stemcell_cid, :text
-          column :stemcell_name, :text
-          column :vm_cid, :text
-          column :disk_cid, :text
-        end
-
-        Sequel::Model.plugin :validation_helpers
-
-        Bosh::Clouds::Config.configure(self)
-
-        require "deployer/models/instance"
-
-        @cloud_options["properties"]["agent"]["mbus"] ||=
-          "https://vcap:b00tstrap@0.0.0.0:6868"
-
-        @disk_model = nil
-        @cloud = nil
-        @networks = nil
-      end
-
-      def cloud
-        if @cloud.nil?
-          @cloud = Bosh::Clouds::Provider.create(@cloud_options["plugin"],
-                                                 @cloud_options["properties"])
-        end
-        @cloud
-      end
-
-      def agent
-        uri = URI.parse(agent_url)
-        user, password = uri.userinfo.split(":", 2)
-        uri.userinfo = nil
-        uri.host = bosh_ip
-        Bosh::Agent::HTTPClient.new(uri.to_s,
-                                    { "user" => user,
-                                      "password" => password,
-                                      "reply_to" => uuid })
-      end
-
-      def agent_url
-        @cloud_options["properties"]["agent"]["mbus"]
-      end
-
-      def networks
-        return @networks if @networks
-
-        @networks = {
-          "bosh" => {
-            "cloud_properties" => @net_conf["cloud_properties"],
-            "netmask"          => @net_conf["netmask"],
-            "gateway"          => @net_conf["gateway"],
-            "ip"               => @net_conf["ip"],
-            "dns"              => @net_conf["dns"],
-            "type"             => @net_conf["type"],
-            "default"          => ["dns", "gateway"]
-          }
-        }
-        if @net_conf["vip"]
-          @networks["vip"] = {
-              "ip" => @net_conf["vip"],
-              "type" => "vip",
-              "cloud_properties" => {}
-          }
-        end
-
-        @networks
-      end
-
-      def task_checkpoint
-        # Bosh::Clouds::Config (bosh_cli >= 0.5.1) delegates task_checkpoint
-        # method to periodically check if director task is cancelled,
-        # so we need to define a void method in Bosh::Deployer::Config to avoid
-        # NoMethodError exceptions.
-      end
-
-      private
-
-      def migrate_cpi
-        cpi = @cloud_options["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)
-
-        if File.directory?(migrations)
-          Sequel.extension :migration
-          Sequel::TimestampMigrator.new(
-              @db, migrations, :table => "#{cpi}_cpi_schema").run
-        end
-      end
-
-      def deep_merge(src, dst)
-        src.merge(dst) do |key, old, new|
-          if new.respond_to?(:blank) && new.blank?
-            old
-          elsif old.kind_of?(Hash) and new.kind_of?(Hash)
-            deep_merge(old, new)
-          elsif old.kind_of?(Array) and new.kind_of?(Array)
-            old.concat(new).uniq
-          else
-            new
-          end
-        end
-      end
-
-      def load_defaults(provider)
-        file = File.join(File.dirname(File.expand_path(__FILE__)), "../../config/#{provider}_defaults.yml")
-        Psych.load_file(file)
-      end
-    end
-  end
-end

data/lib/deployer/instance_manager/vsphere.rb

@@ -1,46 +0,0 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
-module Bosh::Deployer
-  class InstanceManager
-
-    class Vsphere < InstanceManager
-
-      def remote_tunnel(port)
-      end
-
-      def disk_model
-        if @disk_model.nil?
-          require "cloud/vsphere"
-          @disk_model = VSphereCloud::Models::Disk
-        end
-        @disk_model
-      end
-
-      def update_spec(spec)
-        properties = spec.properties
-
-        properties["vcenter"] =
-          Config.spec_properties["vcenter"] ||
-          Config.cloud_options["properties"]["vcenters"].first.dup
-
-        properties["vcenter"]["address"] ||= properties["vcenter"]["host"]
-      end
-    end
-
-    # @return [Integer] size in MiB
-    def disk_size(cid)
-      disk_model.first(:uuid => cid).size
-    end
-
-    def persistent_disk_changed?
-      Config.resources["persistent_disk"] != disk_size(state.disk_cid)
-    end
-
-    def check_dependencies
-      if Bosh::Common.which(%w[genisoimage mkisofs]).nil?
-        err("either of 'genisoimage' or 'mkisofs' commands must be present")
-      end
-    end
-
-  end
-end

data/lib/deployer.rb

@@ -1,23 +0,0 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
-module Bosh; module Deployer; end; end
-
-require "agent_client"
-require "fileutils"
-require "forwardable"
-require "sequel"
-require "sequel/adapters/sqlite"
-require "cloud"
-require "logger"
-require "tmpdir"
-require "securerandom"
-require "yaml"
-require "yajl"
-require "common/common"
-require "common/thread_formatter"
-
-require "deployer/version"
-require "deployer/helpers"
-require "deployer/config"
-require "deployer/specification"
-require "deployer/instance_manager"