vagrant-bosh 0.0.2 → 0.0.3

data/go/src/boshprovisioner/vm/vm_interface.go

@@ -0,0 +1,26 @@
+package vm
+
+import (
+	bpagclient "boshprovisioner/agent/client"
+	bpdep "boshprovisioner/deployment"
+)
+
+type VMProvisioner interface {
+	// Provision creates and configures VM to be usable by BOSH releases.
+	// todo should not rely on bpdep.Instance
+	Provision(bpdep.Instance) (VM, error)
+}
+
+type VMProvisionerConfig struct {
+	// When provisioning, install all dependencies that official stemcells carry.
+	// By default, provisioners will only install absolutely needed dependencies.
+	FullStemcellCompatibility bool `json:"full_stemcell_compatibility"`
+}
+
+type VM interface {
+	// AgentClient returns a client immediately ready for communication.
+	AgentClient() bpagclient.Client
+
+	// Deprovision deletes VM previously provisioned VM.
+	Deprovision() error
+}

data/lib/vagrant-bosh/bootstrapper.rb

@@ -4,11 +4,11 @@ require "json"
 module VagrantPlugins
   module VagrantBosh
     class Bootstrapper
-      def initialize(communicator, asset_uploader, base_dir, manifest, provisioner_tracker)
+      def initialize(communicator, asset_uploader, base_dir, config, provisioner_tracker)
         @c = communicator
         @asset_uploader = asset_uploader
         @base_dir = base_dir
-        @manifest = manifest
+        @config = config
         @provisioner_tracker = provisioner_tracker
         @logger = Log4r::Logger.new("vagrant::provisioners::bosh::bootstrapper")
 
@@ -21,7 +21,7 @@ module VagrantPlugins
       def bootstrap
         @asset_uploader.sync(@assets_path)
 
-        @asset_uploader.upload_text(@manifest, @manifest_path)
+        @asset_uploader.upload_text(@config.manifest, @manifest_path)
 
         config_json = JSON.dump(config_hash)
         @asset_uploader.upload_text(config_json, @config_path)
@@ -31,7 +31,7 @@ module VagrantPlugins
         @c.chmod_x(provisioner_path)
 
         @c.sudo(
-          "#{provisioner_path} -configPath=#{@config_path}", 
+          "#{provisioner_path} -configPath=#{@config_path} 2> >(tee /tmp/provisioner.log >&2)",
           &@provisioner_tracker.method(:add_data)
         )
       end
@@ -43,15 +43,19 @@ module VagrantPlugins
           manifest_path: @manifest_path,
           assets_dir: @assets_path,
           repos_dir: @repos_path,
-          
+
           mbus: "https://user:password@127.0.0.1:4321/agent",
 
           blobstore: {
             provider: "local",
-            options: { 
+            options: {
               blobstore_path: File.join(@base_dir, "blobstore"),
             },
           },
+
+          vm_provisioner: {
+            full_stemcell_compatibility: @config.full_stemcell_compatibility,
+          },
         }
       end
     end

data/lib/vagrant-bosh/config.rb

@@ -3,9 +3,15 @@ require "vagrant"
 module VagrantPlugins
   module VagrantBosh
     class Config < Vagrant.plugin("2", :config)
+      # Manifest holds full BOSH deployment manifest as a string.
       attr_accessor :manifest
 
+      # Full stemcell compatibility forces provisioner to install all 
+      # (not just minimum) dependencies usually found on a stemcell.
+      attr_accessor :full_stemcell_compatibility
+
       def finalize!
+        self.full_stemcell_compatibility = !!self.full_stemcell_compatibility
       end
 
       def validate(machine)

data/lib/vagrant-bosh/provisioner.rb

@@ -27,7 +27,7 @@ module VagrantPlugins
           communicator,
           asset_uploader,
           "/opt/vagrant-bosh",
-          config.manifest,
+          config,
           provisioner_tracker,
         )
 

data/lib/vagrant-bosh/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VagrantBosh
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-bosh
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
+  prerelease: 
 platform: ruby
 authors:
 - Dmitriy Kalinin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies: []
 description: BOSH provisioner allows to provision guest VM by specifying regular BOSH
   deployment manifest.
@@ -64,6 +65,8 @@ files:
 - go/src/boshprovisioner/index/file_index_test.go
 - go/src/boshprovisioner/index/index_interface.go
 - go/src/boshprovisioner/index/index_suite_test.go
+- go/src/boshprovisioner/instance/instance.go
+- go/src/boshprovisioner/instance/instance_provisioner.go
 - go/src/boshprovisioner/instance/templatescompiler/concrete_templates_compiler.go
 - go/src/boshprovisioner/instance/templatescompiler/erbrenderer/erb_renderer.go
 - go/src/boshprovisioner/instance/templatescompiler/erbrenderer/erbrenderer_suite_test.go
@@ -83,7 +86,6 @@ files:
 - go/src/boshprovisioner/instance/updater/applier/empty_state.go
 - go/src/boshprovisioner/instance/updater/applier/job_state.go
 - go/src/boshprovisioner/instance/updater/drainer.go
-- go/src/boshprovisioner/instance/updater/preparer.go
 - go/src/boshprovisioner/instance/updater/starter.go
 - go/src/boshprovisioner/instance/updater/stopper.go
 - go/src/boshprovisioner/instance/updater/updater.go
@@ -104,7 +106,6 @@ files:
 - go/src/boshprovisioner/provisioner/blobstore_config.go
 - go/src/boshprovisioner/provisioner/blobstore_provisioner.go
 - go/src/boshprovisioner/provisioner/deployment_provisioner.go
-- go/src/boshprovisioner/provisioner/instance_provisioner.go
 - go/src/boshprovisioner/provisioner/release_compiler.go
 - go/src/boshprovisioner/release/job/job.go
 - go/src/boshprovisioner/release/job/manifest/manifest.go
@@ -127,16 +128,17 @@ files:
 - go/src/boshprovisioner/tar/compressor_interface.go
 - go/src/boshprovisioner/tar/extractor_interface.go
 - go/src/boshprovisioner/util/string_keyed.go
-- go/src/boshprovisioner/vm/agent_provisioner.go
-- go/src/boshprovisioner/vm/asset_manager.go
-- go/src/boshprovisioner/vm/deps_provisioner.go
-- go/src/boshprovisioner/vm/monit_provisioner.go
-- go/src/boshprovisioner/vm/runit_provisioner.go
-- go/src/boshprovisioner/vm/simple_cmds.go
-- go/src/boshprovisioner/vm/vcap_user_provisioner.go
-- go/src/boshprovisioner/vm/vm.go
-- go/src/boshprovisioner/vm/vm_provisioner.go
-- go/src/boshprovisioner/vm/vm_provisioner_factory.go
+- go/src/boshprovisioner/vm/vagrant/agent_provisioner.go
+- go/src/boshprovisioner/vm/vagrant/asset_manager.go
+- go/src/boshprovisioner/vm/vagrant/deps_provisioner.go
+- go/src/boshprovisioner/vm/vagrant/monit_provisioner.go
+- go/src/boshprovisioner/vm/vagrant/runit_provisioner.go
+- go/src/boshprovisioner/vm/vagrant/simple_cmds.go
+- go/src/boshprovisioner/vm/vagrant/vcap_user_provisioner.go
+- go/src/boshprovisioner/vm/vagrant/vm.go
+- go/src/boshprovisioner/vm/vagrant/vm_provisioner.go
+- go/src/boshprovisioner/vm/vagrant/vm_provisioner_factory.go
+- go/src/boshprovisioner/vm/vm_interface.go
 - lib/vagrant-bosh.rb
 - lib/vagrant-bosh/asset_uploader.rb
 - lib/vagrant-bosh/assets/agent/agent-log
@@ -166,26 +168,27 @@ files:
 homepage: https://github.com/cppforlife/vagrant-bosh
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - templates
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Vagrant BOSH provisioner plugin.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 831ea9bc4698d6a0dea969a338e2d48bfc936306
-  data.tar.gz: d5454ec89149ebd6779f72b7d27226284bdd1bde
-SHA512:
-  metadata.gz: d34fbdcc2ef35e1174997bb0b98800d14493a2a2a308d50a728154be225fe6edc6b6421d1f16ceb7a258195e2f6d956257cbca6af8225ba3f6a0a29430d5e3b9
-  data.tar.gz: d56779c9cca2243e903c21690c1c7a379ed4d663b850554a03aabaf352f646de4aa99c5b0c8797621b92d63498bc7deb5d5a6dd1d8279e0cff67a84bac038055

data/go/src/boshprovisioner/instance/updater/preparer.go

@@ -1,39 +0,0 @@
-package updater
-
-import (
-	boshas "bosh/agent/applier/applyspec"
-	bosherr "bosh/errors"
-	boshlog "bosh/logger"
-
-	bpagclient "boshprovisioner/agent/client"
-)
-
-const preparerLogTag = "Preparer"
-
-type Preparer struct {
-	agentClient bpagclient.Client
-	logger      boshlog.Logger
-}
-
-func NewPreparer(
-	agentClient bpagclient.Client,
-	logger boshlog.Logger,
-) Preparer {
-	return Preparer{
-		agentClient: agentClient,
-		logger:      logger,
-	}
-}
-
-func (p Preparer) Prepare() error {
-	p.logger.Debug(preparerLogTag, "Preparing instance")
-
-	spec := boshas.V1ApplySpec{}
-
-	_, err := p.agentClient.Prepare(spec)
-	if err != nil {
-		return bosherr.WrapError(err, "Sending prepare")
-	}
-
-	return nil
-}

data/go/src/boshprovisioner/provisioner/instance_provisioner.go

@@ -1,48 +0,0 @@
-package provisioner
-
-import (
-	bosherr "bosh/errors"
-	boshlog "bosh/logger"
-
-	bpdep "boshprovisioner/deployment"
-	bpinstupd "boshprovisioner/instance/updater"
-	bpvm "boshprovisioner/vm"
-)
-
-const instanceProvisionerLogTag = "InstanceProvisioner"
-
-type InstanceProvisioner struct {
-	instanceUpdaterFactory bpinstupd.UpdaterFactory
-	vmProvisioner          bpvm.VMProvisioner
-	logger                 boshlog.Logger
-}
-
-func NewInstanceProvisioner(
-	instanceUpdaterFactory bpinstupd.UpdaterFactory,
-	vmProvisioner bpvm.VMProvisioner,
-	logger boshlog.Logger,
-) InstanceProvisioner {
-	return InstanceProvisioner{
-		instanceUpdaterFactory: instanceUpdaterFactory,
-		vmProvisioner:          vmProvisioner,
-		logger:                 logger,
-	}
-}
-
-func (p InstanceProvisioner) Provision(job bpdep.Job, instance bpdep.Instance) error {
-	p.logger.Debug(instanceProvisionerLogTag, "Updating instance")
-
-	vm, err := p.vmProvisioner.Provision(instance)
-	if err != nil {
-		return bosherr.WrapError(err, "Provisioning agent")
-	}
-
-	updater := p.instanceUpdaterFactory.NewUpdater(vm.AgentClient(), job, instance)
-
-	err = updater.Update()
-	if err != nil {
-		return bosherr.WrapError(err, "Updating instance %d", instance.Index)
-	}
-
-	return nil
-}

data/go/src/boshprovisioner/vm/deps_provisioner.go

@@ -1,92 +0,0 @@
-package vm
-
-import (
-	"fmt"
-	"strings"
-
-	bosherr "bosh/errors"
-	boshlog "bosh/logger"
-	boshsys "bosh/system"
-
-	bpeventlog "boshprovisioner/eventlog"
-)
-
-const (
-	depsProvisionerLogTag = "DepsProvisioner"
-	runAptGetUpdateMsg    = "E: Unable to fetch some archives, maybe run apt-get update"
-)
-
-// DepsProvisioner installs basic dependencies for running
-// packaging scripts from BOSH packages. It also installs
-// non-captured dependencies by few common BOSH releases.
-// (e.g. cmake, quota)
-type DepsProvisioner struct {
-	runner   boshsys.CmdRunner
-	eventLog bpeventlog.Log
-	logger   boshlog.Logger
-}
-
-func NewDepsProvisioner(
-	runner boshsys.CmdRunner,
-	eventLog bpeventlog.Log,
-	logger boshlog.Logger,
-) DepsProvisioner {
-	return DepsProvisioner{
-		runner:   runner,
-		eventLog: eventLog,
-		logger:   logger,
-	}
-}
-
-func (p DepsProvisioner) Provision() error {
-	pkgNames := []string{
-		// For packaging scripts in BOSH releases
-		"build-essential", // 16sec
-		"cmake",           // 6sec
-		"libcap-dev",      // 3sec
-
-		"libbz2-1.0",  // noop on precise64 Vagrant box
-		"libbz2-dev",  // 2sec
-		"libxslt-dev", // 2sec
-		"libxml2-dev", // 2sec
-
-		// For warden
-		"quota", // 1sec
-	}
-
-	stage := p.eventLog.BeginStage("Installing dependencies", len(pkgNames))
-
-	for _, pkgName := range pkgNames {
-		task := stage.BeginTask(fmt.Sprintf("Package %s", pkgName))
-
-		err := task.End(p.installPkg(pkgName))
-		if err != nil {
-			return bosherr.WrapError(err, "Installing %s", pkgName)
-		}
-	}
-
-	return nil
-}
-
-func (p DepsProvisioner) installPkg(name string) error {
-	_, _, _, err := p.runner.RunCommand("apt-get", "-y", "install", name)
-	if err == nil {
-		return nil
-	}
-
-	// Avoid running 'apt-get update' since it usually takes 30sec
-	if strings.Contains(err.Error(), runAptGetUpdateMsg) {
-		_, _, _, err := p.runner.RunCommand("apt-get", "-y", "update")
-		if err != nil {
-			return bosherr.WrapError(err, "Updating sources")
-		}
-
-		// Try second time after updating
-		_, _, _, err = p.runner.RunCommand("apt-get", "-y", "install", name)
-		if err != nil {
-			return bosherr.WrapError(err, "Installing %s after updating", name)
-		}
-	}
-
-	return nil
-}

data/go/src/boshprovisioner/vm/vm.go

@@ -1,19 +0,0 @@
-package vm
-
-import (
-	bpagclient "boshprovisioner/agent/client"
-)
-
-// VM represents already provisioned machine
-// that can be communicated with via an AgentClient.
-type VM struct {
-	agentClient bpagclient.Client
-}
-
-func NewVM(agentClient bpagclient.Client) VM {
-	return VM{agentClient: agentClient}
-}
-
-func (vm VM) AgentClient() bpagclient.Client {
-	return vm.agentClient
-}

data/go/src/boshprovisioner/vm/vm_provisioner.go

@@ -1,57 +0,0 @@
-package vm
-
-import (
-	bosherr "bosh/errors"
-	boshlog "bosh/logger"
-
-	bpdep "boshprovisioner/deployment"
-)
-
-const vmProvisionerLogTag = "VMProvisioner"
-
-// VMProvisioner installs system dependencies that
-// are usually found on a stemcell, adds vcap user,
-// and finally install Agent and Monit.
-type VMProvisioner struct {
-	vcapUserProvisioner VCAPUserProvisioner
-	depsProvisioner     DepsProvisioner
-	agentProvisioner    AgentProvisioner
-
-	logger boshlog.Logger
-}
-
-func NewVMProvisioner(
-	vcapUserProvisioner VCAPUserProvisioner,
-	depsProvisioner DepsProvisioner,
-	agentProvisioner AgentProvisioner,
-	logger boshlog.Logger,
-) VMProvisioner {
-	return VMProvisioner{
-		vcapUserProvisioner: vcapUserProvisioner,
-		depsProvisioner:     depsProvisioner,
-		agentProvisioner:    agentProvisioner,
-
-		logger: logger,
-	}
-}
-
-func (p VMProvisioner) Provision(instance bpdep.Instance) (VM, error) {
-	var vm VM
-
-	err := p.vcapUserProvisioner.Provision()
-	if err != nil {
-		return vm, bosherr.WrapError(err, "Provisioning vcap user")
-	}
-
-	err = p.depsProvisioner.Provision()
-	if err != nil {
-		return vm, bosherr.WrapError(err, "Provisioning dependencies")
-	}
-
-	agentClient, err := p.agentProvisioner.Provision(instance)
-	if err != nil {
-		return vm, bosherr.WrapError(err, "Provisioning agent")
-	}
-
-	return NewVM(agentClient), nil
-}