vagrant-bosh 0.0.6 → 0.0.7

data/go/src/boshprovisioner/vm/vagrant/asset_manager.go

@@ -1,61 +0,0 @@
-package vagrant
-
-import (
-	"fmt"
-	"path/filepath"
-
-	bosherr "bosh/errors"
-	boshlog "bosh/logger"
-	boshsys "bosh/system"
-)
-
-type AssetManager struct {
-	rootDir string
-	fs      boshsys.FileSystem
-	runner  boshsys.CmdRunner
-	logger  boshlog.Logger
-}
-
-func NewAssetManager(
-	rootDir string,
-	fs boshsys.FileSystem,
-	runner boshsys.CmdRunner,
-	logger boshlog.Logger,
-) AssetManager {
-	return AssetManager{
-		rootDir: rootDir,
-		fs:      fs,
-		runner:  runner,
-		logger:  logger,
-	}
-}
-
-func (m AssetManager) Place(name, dstPath string) error {
-	srcPath := filepath.Join(m.rootDir, name)
-
-	if !m.fs.FileExists(srcPath) {
-		return bosherr.New("Missing asset %s at %s", name, srcPath)
-	}
-
-	tempDir, err := m.fs.TempDir("vm-AssetManager")
-	if err != nil {
-		return bosherr.WrapError(err, "Creating temp dir")
-	}
-
-	defer m.fs.RemoveAll(tempDir)
-
-	srcCopyPath := fmt.Sprintf("%s/copy", tempDir)
-
-	// todo fs.CopyFile leaks fds
-	_, _, _, err = m.runner.RunCommand("cp", srcPath, srcCopyPath)
-	if err != nil {
-		return bosherr.WrapError(err, "Copying asset")
-	}
-
-	err = m.fs.Rename(srcCopyPath, dstPath)
-	if err != nil {
-		return bosherr.WrapError(err, "Renaming asset %s to %s", name, dstPath)
-	}
-
-	return nil
-}

data/go/src/boshprovisioner/vm/vagrant/configured_vm.go

@@ -1,29 +0,0 @@
-package vagrant
-
-import (
-	bpagclient "boshprovisioner/agent/client"
-)
-
-// ConfiguredVM represents provisioned Vagrant machine
-// that can be communicated with via an AgentClient.
-type ConfiguredVM struct {
-	vmProvisioner *VMProvisioner
-	agentClient   bpagclient.Client
-}
-
-func NewConfiguredVM(vmProvisioner *VMProvisioner, agentClient bpagclient.Client) ConfiguredVM {
-	return ConfiguredVM{
-		vmProvisioner: vmProvisioner,
-		agentClient:   agentClient,
-	}
-}
-
-func (vm ConfiguredVM) AgentClient() bpagclient.Client {
-	return vm.agentClient
-}
-
-func (vm ConfiguredVM) Deprovision() error {
-	return vm.vmProvisioner.deprovision(vm)
-}
-
-func (vm ConfiguredVM) vagrantVM() {}

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

@@ -1,214 +0,0 @@
-package vagrant
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	bosherr "bosh/errors"
-	boshlog "bosh/logger"
-	boshsys "bosh/system"
-
-	bpeventlog "boshprovisioner/eventlog"
-)
-
-const (
-	depsProvisionerLogTag          = "DepsProvisioner"
-	depsProvisionerAptGetUpdateMsg = "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 {
-	fullStemcellCompatibility bool
-
-	runner   boshsys.CmdRunner
-	eventLog bpeventlog.Log
-	logger   boshlog.Logger
-}
-
-func NewDepsProvisioner(
-	fullStemcellCompatibility bool,
-	runner boshsys.CmdRunner,
-	eventLog bpeventlog.Log,
-	logger boshlog.Logger,
-) DepsProvisioner {
-	return DepsProvisioner{
-		fullStemcellCompatibility: fullStemcellCompatibility,
-
-		runner:   runner,
-		eventLog: eventLog,
-		logger:   logger,
-	}
-}
-
-func (p DepsProvisioner) Provision() error {
-	pkgNames := depsProvisionerPkgsForMinimumStemcellCompatibility
-
-	if p.fullStemcellCompatibility {
-		pkgNames = append(pkgNames, depsProvisionerPkgsForFullStemcellCompatibility...)
-	}
-
-	stage := p.eventLog.BeginStage("Installing dependencies", len(pkgNames))
-
-	installedPkgNames, err := p.listInstalledPkgNames()
-	if err != nil {
-		return bosherr.WrapError(err, "Listing installed packages")
-	}
-
-	for _, pkgName := range pkgNames {
-		task := stage.BeginTask(fmt.Sprintf("Package %s", pkgName))
-
-		if p.isPkgInstalled(pkgName, installedPkgNames) {
-			p.logger.Debug(depsProvisionerLogTag, "Package %s is already installed", pkgName)
-			task.End(nil)
-			continue
-		}
-
-		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 {
-	p.logger.Debug(depsProvisionerLogTag, "Installing package %s", name)
-
-	_, _, _, 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(), depsProvisionerAptGetUpdateMsg) {
-		_, _, _, err := p.runner.RunCommand("apt-get", "-y", "update")
-		if err != nil {
-			return bosherr.WrapError(err, "Updating sources")
-		}
-
-		var lastInstallErr error
-
-		// For some reason libssl-dev was really hard to install on the first try
-		for i := 0; i < 3; i++ {
-			_, _, _, lastInstallErr = p.runner.RunCommand("apt-get", "-y", "install", name)
-			if lastInstallErr == nil {
-				return nil
-			}
-
-			time.Sleep(1 * time.Second)
-		}
-
-		return bosherr.WrapError(lastInstallErr, "Installing %s after updating", name)
-	}
-
-	return err
-}
-
-func (p DepsProvisioner) listInstalledPkgNames() ([]string, error) {
-	var installedPkgNames []string
-
-	installedPkgStdout, _, _, err := p.runner.RunCommand("dpkg", "--get-selections")
-	if err != nil {
-		return nil, bosherr.WrapError(err, "dkpg query")
-	}
-
-	// e.g. 'zlib1g:amd64 install'
-	//      'util-linux   install'
-	for _, line := range strings.Split(installedPkgStdout, "\n") {
-		pieces := strings.Fields(line)
-
-		// Last line is empty
-		if len(pieces) == 2 && pieces[1] == "install" {
-			pkgName := strings.Split(pieces[0], ":")[0]
-			installedPkgNames = append(installedPkgNames, pkgName)
-		}
-	}
-
-	return installedPkgNames, nil
-}
-
-func (p DepsProvisioner) isPkgInstalled(pkgName string, installedPkgs []string) bool {
-	for _, installedPkgName := range installedPkgs {
-		if installedPkgName == pkgName {
-			return true
-		}
-	}
-
-	return false
-}
-
-var depsProvisionerPkgsForMinimumStemcellCompatibility = []string{
-	// Most BOSH releases require it for packaging
-	"build-essential", // 16sec
-	"cmake",           // 6sec
-
-	"libcap2-bin",
-	"libcap-dev",
-
-	"libbz2-1.0",   // noop on precise64 Vagrant box
-	"libbz2-dev",   // 2sec
-	"libxslt1-dev", // 2sec
-	"libxml2-dev",  // 2sec
-
-	// Used by BOSH Agent
-	"iputils-arping",
-
-	// For warden
-	"quota", // 1sec
-
-	// Started needing that in saucy for building BOSH
-	"libssl-dev",
-
-	"bison",
-	"flex",
-
-	"gettext",
-	"libreadline6-dev",
-	"libncurses5-dev",
-}
-
-// Taken from base_apt stemcell builder stage
-var depsProvisionerPkgsForFullStemcellCompatibility = []string{
-	"libaio1",
-	"uuid-dev",
-	"nfs-common",
-	"zlib1g-dev",
-	"apparmor-utils",
-	"openssh-server",
-
-	"libgcrypt-dev",
-	"ca-certificates",
-
-	// CURL
-	"libcurl3",
-	"libcurl3-dev",
-
-	// XML
-	"libxml2",
-	"libxml2-dev",
-	"libxslt1.1",
-	"libxslt1-dev",
-
-	// Utils
-	"bind9-host",
-	"dnsutils",
-	"zip",
-	"unzip",
-	"psmisc",
-	"lsof",
-	"strace",
-	"curl",
-	"wget",
-	"gdb",
-	"sysstat",
-	"rsync",
-
-	"iptables",
-	"tcpdump",
-	"traceroute",
-}

data/go/src/boshprovisioner/vm/vagrant/monit_provisioner.go

@@ -1,85 +0,0 @@
-package vagrant
-
-import (
-	"time"
-
-	bosherr "bosh/errors"
-	boshlog "bosh/logger"
-)
-
-const monitProvisionerLogTag = "MonitProvisioner"
-
-// MonitProvisioner installs Monit binary.
-type MonitProvisioner struct {
-	cmds             SimpleCmds
-	assetManager     AssetManager
-	runitProvisioner RunitProvisioner
-	logger           boshlog.Logger
-}
-
-func NewMonitProvisioner(
-	cmds SimpleCmds,
-	assetManager AssetManager,
-	runitProvisioner RunitProvisioner,
-	logger boshlog.Logger,
-) MonitProvisioner {
-	return MonitProvisioner{
-		cmds:             cmds,
-		assetManager:     assetManager,
-		runitProvisioner: runitProvisioner,
-		logger:           logger,
-	}
-}
-
-func (p MonitProvisioner) Provision() error {
-	path := "/var/vcap/monit"
-
-	err := p.cmds.MkdirP(path)
-	if err != nil {
-		return err
-	}
-
-	err = p.configureMonitrc()
-	if err != nil {
-		return bosherr.WrapError(err, "Configuring monitrc")
-	}
-
-	err = p.runitProvisioner.Provision("monit", 1*time.Minute)
-	if err != nil {
-		return bosherr.WrapError(err, "Provisioning monit with runit")
-	}
-
-	return nil
-}
-
-func (p MonitProvisioner) configureMonitrc() error {
-	p.logger.Info(monitProvisionerLogTag, "Configuring monitc")
-
-	err := p.cmds.MkdirP("/var/vcap/bosh/etc")
-	if err != nil {
-		return err
-	}
-
-	err = p.assetManager.Place("monit/monitrc", "/var/vcap/bosh/etc/monitrc")
-	if err != nil {
-		return bosherr.WrapError(err, "Placing monitrc")
-	}
-
-	err = p.cmds.Chmod("700", "/var/vcap/bosh/etc/monitrc")
-	if err != nil {
-		return err
-	}
-
-	// monit refuses to start without an include file present
-	err = p.cmds.MkdirP("/var/vcap/monit")
-	if err != nil {
-		return err
-	}
-
-	err = p.cmds.Touch("/var/vcap/monit/empty.monitrc")
-	if err != nil {
-		return err
-	}
-
-	return nil
-}

data/go/src/boshprovisioner/vm/vagrant/non_configured_vm.go

@@ -1,26 +0,0 @@
-package vagrant
-
-import (
-	bpagclient "boshprovisioner/agent/client"
-)
-
-// NonConfiguredVM represents provisioned Vagrant machine
-// that CANNOT be communicated with via an AgentClient.
-type NonConfiguredVM struct {
-	vmProvisioner *VMProvisioner
-}
-
-func NewNonConfiguredVM(vmProvisioner *VMProvisioner) NonConfiguredVM {
-	return NonConfiguredVM{vmProvisioner: vmProvisioner}
-}
-
-func (vm NonConfiguredVM) AgentClient() bpagclient.Client {
-	// Programmer error
-	panic("Must not ask for AgentClient from a non-configured VM")
-}
-
-func (vm NonConfiguredVM) Deprovision() error {
-	return vm.vmProvisioner.deprovision(vm)
-}
-
-func (vm NonConfiguredVM) vagrantVM() {}

data/go/src/boshprovisioner/vm/vagrant/runit_provisioner.go

@@ -1,229 +0,0 @@
-package vagrant
-
-import (
-	"fmt"
-	"regexp"
-	"strings"
-	"time"
-
-	bosherr "bosh/errors"
-	boshlog "bosh/logger"
-	boshsys "bosh/system"
-)
-
-const (
-	runitProvisionerLogTag = "RunitProvisioner"
-	runitStopStepDuration  = 1 * time.Second
-)
-
-var (
-	// Matches 'svlogd -tt /var/vcap/bosh/log'
-	runitSvlogdRegex = regexp.MustCompile(`\s*svlogd\s+\-tt\s+(.+)\s*`)
-
-	// Matches 'down: agent: 3s, normally up; run: log: (pid 15318) 7762s'
-	runitStatusDownRegex = regexp.MustCompile(`\Adown: [a-z\/]+: \d+`)
-)
-
-// RunitProvisioner installs runit via apt-get and
-// adds specified service under runit's control.
-type RunitProvisioner struct {
-	fs           boshsys.FileSystem
-	cmds         SimpleCmds
-	runner       boshsys.CmdRunner
-	assetManager AssetManager
-	logger       boshlog.Logger
-}
-
-func NewRunitProvisioner(
-	fs boshsys.FileSystem,
-	cmds SimpleCmds,
-	runner boshsys.CmdRunner,
-	assetManager AssetManager,
-	logger boshlog.Logger,
-) RunitProvisioner {
-	return RunitProvisioner{
-		fs:           fs,
-		cmds:         cmds,
-		runner:       runner,
-		assetManager: assetManager,
-		logger:       logger,
-	}
-}
-
-func (p RunitProvisioner) Provision(name string, stopTimeout time.Duration) error {
-	err := p.installRunit()
-	if err != nil {
-		return bosherr.WrapError(err, "Installing runit")
-	}
-
-	err = p.setUpService(name, stopTimeout)
-	if err != nil {
-		return bosherr.WrapError(err, "Setting up service")
-	}
-
-	return nil
-}
-
-func (p RunitProvisioner) installRunit() error {
-	p.logger.Info(runitProvisionerLogTag, "Installing runit")
-
-	// todo non-bash
-	cmd := boshsys.Command{
-		Name: "bash",
-		Args: []string{
-			"-c", "apt-get -q -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' install runit",
-		},
-		Env: map[string]string{
-			"DEBIAN_FRONTEND": "noninteractive",
-		},
-	}
-
-	_, _, _, err := p.runner.RunComplexCommand(cmd)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (p RunitProvisioner) setUpService(name string, stopTimeout time.Duration) error {
-	p.logger.Info(runitProvisionerLogTag, "Setting up %s service", name)
-
-	servicePath := fmt.Sprintf("/etc/sv/%s", name)
-	enableServicePath := fmt.Sprintf("/etc/service/%s", name)
-
-	err := p.stopRunAndLog(servicePath, enableServicePath, name, stopTimeout)
-	if err != nil {
-		return bosherr.WrapError(err, "Stopping run and log")
-	}
-
-	err = p.setUpRun(servicePath, name)
-	if err != nil {
-		return bosherr.WrapError(err, "Setting up run")
-	}
-
-	err = p.setUpLog(servicePath, name)
-	if err != nil {
-		return bosherr.WrapError(err, "Setting up log")
-	}
-
-	err = p.startRunAndLog(servicePath, enableServicePath, name)
-	if err != nil {
-		return bosherr.WrapError(err, "Starting run and log")
-	}
-
-	return nil
-}
-
-// setUpRun sets up script that runit will execute for the primary process
-func (p RunitProvisioner) setUpRun(servicePath, name string) error {
-	err := p.cmds.MkdirP(servicePath)
-	if err != nil {
-		return err
-	}
-
-	runPath := fmt.Sprintf("%s/run", servicePath)
-
-	err = p.assetManager.Place(fmt.Sprintf("%s/%s-run", name, name), runPath)
-	if err != nil {
-		return err
-	}
-
-	return p.cmds.ChmodX(runPath)
-}
-
-// setUpLog sets up logging destination for the service
-func (p RunitProvisioner) setUpLog(servicePath, name string) error {
-	logPath := fmt.Sprintf("%s/log", servicePath)
-
-	err := p.cmds.MkdirP(logPath)
-	if err != nil {
-		return err
-	}
-
-	logRunPath := fmt.Sprintf("%s/run", logPath)
-
-	err = p.assetManager.Place(fmt.Sprintf("%s/%s-log", name, name), logRunPath)
-	if err != nil {
-		return err
-	}
-
-	err = p.cmds.ChmodX(logRunPath)
-	if err != nil {
-		return err
-	}
-
-	contens, err := p.fs.ReadFileString(logRunPath)
-	if err != nil {
-		return err
-	}
-
-	// First match is the whole string
-	svlogdPaths := runitSvlogdRegex.FindStringSubmatch(contens)
-
-	// Create log file destination so that runit process can properly log
-	if len(svlogdPaths) == 2 {
-		err = p.cmds.MkdirP(svlogdPaths[1])
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (p RunitProvisioner) stopRunAndLog(servicePath, enableServicePath, name string, stopTimeout time.Duration) error {
-	err := p.stopRunsv(name, stopTimeout)
-	if err != nil {
-		return bosherr.WrapError(err, "Stopping service")
-	}
-
-	err = p.stopRunsv(fmt.Sprintf("%s/log", name), stopTimeout)
-	if err != nil {
-		return bosherr.WrapError(err, "Stopping log service")
-	}
-
-	err = p.fs.RemoveAll(enableServicePath)
-	if err != nil {
-		return err
-	}
-
-	// Clear out all service state kept in supervise/ and control/ dirs
-	return p.fs.RemoveAll(servicePath)
-}
-
-func (p RunitProvisioner) startRunAndLog(servicePath, enableServicePath, name string) error {
-	// Enabling service will kick in monitoring
-	_, _, _, err := p.runner.RunCommand("ln", "-sf", servicePath, enableServicePath)
-
-	return err
-}
-
-func (p RunitProvisioner) stopRunsv(name string, stopTimeout time.Duration) error {
-	p.logger.Info(runitProvisionerLogTag, "Stopping runsv")
-
-	downStdout, _, _, err := p.runner.RunCommand("sv", "down", name)
-	if err != nil {
-		p.logger.Error(runitProvisionerLogTag, "Ignoring down error %s", err.Error())
-	}
-
-	// If runsv configuration does not exist, service was never started
-	if strings.Contains(downStdout, "file does not exist") {
-		return nil
-	}
-
-	var lastStatusStdout string
-	var passedDuration time.Duration
-
-	for ; passedDuration < stopTimeout; passedDuration += runitStopStepDuration {
-		lastStatusStdout, _, _, _ = p.runner.RunCommand("sv", "status", name)
-
-		if runitStatusDownRegex.MatchString(lastStatusStdout) {
-			return nil
-		}
-
-		time.Sleep(runitStopStepDuration)
-	}
-
-	return bosherr.New("Failed to stop runsv for %s. Output: %s", name, lastStatusStdout)
-}