vagrant-bosh 0.0.6 → 0.0.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitmodules +3 -6
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/agent/agent-log +0 -0
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/agent/agent-run +0 -0
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/agent/agent.cert +0 -0
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/agent/agent.json +0 -0
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/agent/agent.key +0 -0
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/agent/bosh-agent +0 -0
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/agent/bosh-agent-rc +0 -0
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/agent/bosh-blobstore-dav +0 -0
- data/bosh-provisioner/assets/bosh-provisioner +0 -0
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/monit/monit +0 -0
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/monit/monit-log +0 -0
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/monit/monit-run +0 -0
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/monit/monitrc +0 -0
- data/dev/Vagrantfile +1 -1
- data/dev/example-bosh-manifest.yml +12 -12
- data/lib/vagrant-bosh/bootstrapper.rb +6 -2
- data/lib/vagrant-bosh/config.rb +1 -1
- data/lib/vagrant-bosh/provisioner.rb +1 -1
- data/lib/vagrant-bosh/version.rb +1 -1
- data/vagrant-bosh.gemspec +3 -1
- metadata +20 -139
- data/go/.gitignore +0 -11
- data/go/bin/build +0 -10
- data/go/bin/build-linux-amd64 +0 -9
- data/go/bin/env +0 -13
- data/go/bin/go +0 -5
- data/go/bin/golint +0 -19
- data/go/bin/test +0 -37
- data/go/src/boshprovisioner/agent/client/client_interface.go +0 -73
- data/go/src/boshprovisioner/agent/client/fakes/fake_client.go +0 -81
- data/go/src/boshprovisioner/agent/client/http_client.go +0 -299
- data/go/src/boshprovisioner/agent/client/http_client_envelope.go +0 -107
- data/go/src/boshprovisioner/deployment/deployment.go +0 -221
- data/go/src/boshprovisioner/deployment/instance.go +0 -54
- data/go/src/boshprovisioner/deployment/manifest/deployment.go +0 -84
- data/go/src/boshprovisioner/deployment/manifest/ips.go +0 -23
- data/go/src/boshprovisioner/deployment/manifest/manifest.go +0 -143
- data/go/src/boshprovisioner/deployment/manifest/manifest_suite_test.go +0 -13
- data/go/src/boshprovisioner/deployment/manifest/manifest_test.go +0 -86
- data/go/src/boshprovisioner/deployment/manifest/syntax_validator.go +0 -186
- data/go/src/boshprovisioner/deployment/manifest/watch_time.go +0 -43
- data/go/src/boshprovisioner/deployment/manifest_reader.go +0 -46
- data/go/src/boshprovisioner/deployment/reader_factory.go +0 -25
- data/go/src/boshprovisioner/deployment/semantic_validator.go +0 -111
- data/go/src/boshprovisioner/downloader/blobstore_downloader.go +0 -55
- data/go/src/boshprovisioner/downloader/default_mux_downloader.go +0 -22
- data/go/src/boshprovisioner/downloader/downloader_interface.go +0 -6
- data/go/src/boshprovisioner/downloader/http_downloader.go +0 -53
- data/go/src/boshprovisioner/downloader/local_fs_downloader.go +0 -48
- data/go/src/boshprovisioner/downloader/mux_downloader.go +0 -69
- data/go/src/boshprovisioner/eventlog/log.go +0 -72
- data/go/src/boshprovisioner/eventlog/stage.go +0 -39
- data/go/src/boshprovisioner/eventlog/task.go +0 -58
- data/go/src/boshprovisioner/index/file_index.go +0 -289
- data/go/src/boshprovisioner/index/file_index_test.go +0 -296
- data/go/src/boshprovisioner/index/index_interface.go +0 -18
- data/go/src/boshprovisioner/index/index_suite_test.go +0 -13
- data/go/src/boshprovisioner/instance/instance.go +0 -43
- data/go/src/boshprovisioner/instance/instance_provisioner.go +0 -48
- data/go/src/boshprovisioner/instance/templatescompiler/concrete_templates_compiler.go +0 -284
- data/go/src/boshprovisioner/instance/templatescompiler/erbrenderer/erb_renderer.go +0 -117
- data/go/src/boshprovisioner/instance/templatescompiler/erbrenderer/erbrenderer_suite_test.go +0 -13
- data/go/src/boshprovisioner/instance/templatescompiler/erbrenderer/render_properties.go +0 -77
- data/go/src/boshprovisioner/instance/templatescompiler/erbrenderer/render_properties_test.go +0 -193
- data/go/src/boshprovisioner/instance/templatescompiler/erbrenderer/template_evaluation_context.go +0 -85
- data/go/src/boshprovisioner/instance/templatescompiler/erbrenderer/template_evaluation_context_rb.go +0 -155
- data/go/src/boshprovisioner/instance/templatescompiler/jobsrepo/concrete_jobs_repository.go +0 -86
- data/go/src/boshprovisioner/instance/templatescompiler/jobsrepo/concrete_runtime_packages_repository.go +0 -113
- data/go/src/boshprovisioner/instance/templatescompiler/jobsrepo/concrete_template_to_job_repository.go +0 -86
- data/go/src/boshprovisioner/instance/templatescompiler/jobsrepo/jobs_repository_interface.go +0 -49
- data/go/src/boshprovisioner/instance/templatescompiler/rendered_archives_compiler.go +0 -81
- data/go/src/boshprovisioner/instance/templatescompiler/templates_compiler_interface.go +0 -20
- data/go/src/boshprovisioner/instance/templatescompiler/templatesrepo/ct_repository.go +0 -54
- data/go/src/boshprovisioner/instance/templatescompiler/templatesrepo/templates_repository_interface.go +0 -16
- data/go/src/boshprovisioner/instance/updater/applier/applier.go +0 -93
- data/go/src/boshprovisioner/instance/updater/applier/empty_state.go +0 -66
- data/go/src/boshprovisioner/instance/updater/applier/job_state.go +0 -178
- data/go/src/boshprovisioner/instance/updater/drainer.go +0 -72
- data/go/src/boshprovisioner/instance/updater/starter.go +0 -36
- data/go/src/boshprovisioner/instance/updater/stopper.go +0 -36
- data/go/src/boshprovisioner/instance/updater/updater.go +0 -97
- data/go/src/boshprovisioner/instance/updater/updater_factory.go +0 -80
- data/go/src/boshprovisioner/instance/updater/updater_suite_test.go +0 -13
- data/go/src/boshprovisioner/instance/updater/waiter.go +0 -77
- data/go/src/boshprovisioner/instance/updater/waiter_test.go +0 -147
- data/go/src/boshprovisioner/main/config.go +0 -95
- data/go/src/boshprovisioner/main/config_test.go +0 -67
- data/go/src/boshprovisioner/main/main.go +0 -185
- data/go/src/boshprovisioner/main/main_suite_test.go +0 -13
- data/go/src/boshprovisioner/main/repos_factory.go +0 -86
- data/go/src/boshprovisioner/packagescompiler/compiledpackagesrepo/compiled_packages_repository_interface.go +0 -17
- data/go/src/boshprovisioner/packagescompiler/compiledpackagesrepo/concrete_compiled_packages_repository.go +0 -61
- data/go/src/boshprovisioner/packagescompiler/concrete_packages_compiler.go +0 -179
- data/go/src/boshprovisioner/packagescompiler/concrete_packages_compiler_factory.go +0 -48
- data/go/src/boshprovisioner/packagescompiler/packages_compiler_interface.go +0 -20
- data/go/src/boshprovisioner/packagescompiler/packagesrepo/concrete_packages_repository.go +0 -65
- data/go/src/boshprovisioner/packagescompiler/packagesrepo/packages_repository_interface.go +0 -16
- data/go/src/boshprovisioner/provisioner/blobstore_config.go +0 -65
- data/go/src/boshprovisioner/provisioner/blobstore_provisioner.go +0 -38
- data/go/src/boshprovisioner/provisioner/deployment_provisioner_interface.go +0 -10
- data/go/src/boshprovisioner/provisioner/release_compiler.go +0 -95
- data/go/src/boshprovisioner/provisioner/single_configured_vm_provisioner.go +0 -124
- data/go/src/boshprovisioner/provisioner/single_non_configured_vm_provisioner.go +0 -40
- data/go/src/boshprovisioner/provisioner/single_vm_provisioner_factory.go +0 -68
- data/go/src/boshprovisioner/release/dir_reader.go +0 -146
- data/go/src/boshprovisioner/release/job/job.go +0 -86
- data/go/src/boshprovisioner/release/job/manifest/manifest.go +0 -79
- data/go/src/boshprovisioner/release/job/manifest/manifest_suite_test.go +0 -13
- data/go/src/boshprovisioner/release/job/manifest/manifest_test.go +0 -59
- data/go/src/boshprovisioner/release/job/manifest/syntax_validator.go +0 -43
- data/go/src/boshprovisioner/release/job/reader_factory.go +0 -34
- data/go/src/boshprovisioner/release/job/tar_reader.go +0 -133
- data/go/src/boshprovisioner/release/manifest/manifest.go +0 -120
- data/go/src/boshprovisioner/release/manifest/manifest_suite_test.go +0 -13
- data/go/src/boshprovisioner/release/manifest/manifest_test.go +0 -126
- data/go/src/boshprovisioner/release/manifest/syntax_validator.go +0 -134
- data/go/src/boshprovisioner/release/reader_factory.go +0 -45
- data/go/src/boshprovisioner/release/reader_interface.go +0 -6
- data/go/src/boshprovisioner/release/release.go +0 -144
- data/go/src/boshprovisioner/release/release_suite_test.go +0 -13
- data/go/src/boshprovisioner/release/release_test.go +0 -129
- data/go/src/boshprovisioner/release/tar_reader.go +0 -141
- data/go/src/boshprovisioner/tar/cmd_compressor.go +0 -68
- data/go/src/boshprovisioner/tar/cmd_extractor.go +0 -47
- data/go/src/boshprovisioner/tar/compressor_interface.go +0 -6
- data/go/src/boshprovisioner/tar/extractor_interface.go +0 -6
- data/go/src/boshprovisioner/util/possible_base64.go +0 -21
- data/go/src/boshprovisioner/util/string_keyed.go +0 -70
- data/go/src/boshprovisioner/vm/vagrant/agent_provisioner.go +0 -296
- data/go/src/boshprovisioner/vm/vagrant/asset_manager.go +0 -61
- data/go/src/boshprovisioner/vm/vagrant/configured_vm.go +0 -29
- data/go/src/boshprovisioner/vm/vagrant/deps_provisioner.go +0 -214
- data/go/src/boshprovisioner/vm/vagrant/monit_provisioner.go +0 -85
- data/go/src/boshprovisioner/vm/vagrant/non_configured_vm.go +0 -26
- data/go/src/boshprovisioner/vm/vagrant/runit_provisioner.go +0 -229
- data/go/src/boshprovisioner/vm/vagrant/simple_cmds.go +0 -54
- data/go/src/boshprovisioner/vm/vagrant/vcap_user_provisioner.go +0 -167
- data/go/src/boshprovisioner/vm/vagrant/vm_provisioner.go +0 -119
- data/go/src/boshprovisioner/vm/vagrant/vm_provisioner_factory.go +0 -101
- data/go/src/boshprovisioner/vm/vm_interface.go +0 -45
- data/lib/vagrant-bosh/assets/provisioner +0 -0
@@ -1,54 +0,0 @@
|
|
1
|
-
package vagrant
|
2
|
-
|
3
|
-
import (
|
4
|
-
boshlog "bosh/logger"
|
5
|
-
boshsys "bosh/system"
|
6
|
-
)
|
7
|
-
|
8
|
-
type SimpleCmds struct {
|
9
|
-
runner boshsys.CmdRunner
|
10
|
-
logger boshlog.Logger
|
11
|
-
}
|
12
|
-
|
13
|
-
func NewSimpleCmds(
|
14
|
-
runner boshsys.CmdRunner,
|
15
|
-
logger boshlog.Logger,
|
16
|
-
) SimpleCmds {
|
17
|
-
return SimpleCmds{
|
18
|
-
runner: runner,
|
19
|
-
logger: logger,
|
20
|
-
}
|
21
|
-
}
|
22
|
-
|
23
|
-
func (r SimpleCmds) MkdirP(path string) error {
|
24
|
-
return r.run("mkdir", "-p", path)
|
25
|
-
}
|
26
|
-
|
27
|
-
func (r SimpleCmds) ChmodX(path string) error {
|
28
|
-
return r.run("chmod", "+x", path)
|
29
|
-
}
|
30
|
-
|
31
|
-
func (r SimpleCmds) Touch(path string) error {
|
32
|
-
return r.run("touch", path)
|
33
|
-
}
|
34
|
-
|
35
|
-
func (r SimpleCmds) Mv(srcPath, dstPath string) error {
|
36
|
-
return r.run("mv", srcPath, dstPath)
|
37
|
-
}
|
38
|
-
|
39
|
-
func (r SimpleCmds) Chmod(mode, path string) error {
|
40
|
-
return r.run("chmod", mode, path)
|
41
|
-
}
|
42
|
-
|
43
|
-
func (r SimpleCmds) Chown(user, group, path string) error {
|
44
|
-
return r.run("chmod", user+":"+group, path)
|
45
|
-
}
|
46
|
-
|
47
|
-
func (r SimpleCmds) Bash(script string) error {
|
48
|
-
return r.run("bash", "-c", script)
|
49
|
-
}
|
50
|
-
|
51
|
-
func (r SimpleCmds) run(cmd string, args ...string) error {
|
52
|
-
_, _, _, err := r.runner.RunCommand(cmd, args...)
|
53
|
-
return err
|
54
|
-
}
|
@@ -1,167 +0,0 @@
|
|
1
|
-
package vagrant
|
2
|
-
|
3
|
-
import (
|
4
|
-
"strings"
|
5
|
-
|
6
|
-
bosherr "bosh/errors"
|
7
|
-
boshlog "bosh/logger"
|
8
|
-
boshsys "bosh/system"
|
9
|
-
|
10
|
-
bpeventlog "boshprovisioner/eventlog"
|
11
|
-
)
|
12
|
-
|
13
|
-
const vcapUserProvisionerLogTag = "VCAPUserProvisioner"
|
14
|
-
|
15
|
-
// VCAPUserProvisioner adds and configures vcap user.
|
16
|
-
type VCAPUserProvisioner struct {
|
17
|
-
fs boshsys.FileSystem
|
18
|
-
runner boshsys.CmdRunner
|
19
|
-
eventLog bpeventlog.Log
|
20
|
-
logger boshlog.Logger
|
21
|
-
}
|
22
|
-
|
23
|
-
func NewVCAPUserProvisioner(
|
24
|
-
fs boshsys.FileSystem,
|
25
|
-
runner boshsys.CmdRunner,
|
26
|
-
eventLog bpeventlog.Log,
|
27
|
-
logger boshlog.Logger,
|
28
|
-
) VCAPUserProvisioner {
|
29
|
-
return VCAPUserProvisioner{
|
30
|
-
fs: fs,
|
31
|
-
runner: runner,
|
32
|
-
eventLog: eventLog,
|
33
|
-
logger: logger,
|
34
|
-
}
|
35
|
-
}
|
36
|
-
|
37
|
-
func (p VCAPUserProvisioner) Provision() error {
|
38
|
-
stage := p.eventLog.BeginStage("Setting up vcap user", 3)
|
39
|
-
|
40
|
-
task := stage.BeginTask("Adding vcap user")
|
41
|
-
|
42
|
-
err := task.End(p.setUpVcapUser())
|
43
|
-
if err != nil {
|
44
|
-
return bosherr.WrapError(err, "Setting up vcap user")
|
45
|
-
}
|
46
|
-
|
47
|
-
task = stage.BeginTask("Configuring locales")
|
48
|
-
|
49
|
-
err = task.End(p.configureLocales())
|
50
|
-
if err != nil {
|
51
|
-
return bosherr.WrapError(err, "Configuring locales")
|
52
|
-
}
|
53
|
-
|
54
|
-
task = stage.BeginTask("Harden permissions")
|
55
|
-
|
56
|
-
err = task.End(p.hardenPermissinons())
|
57
|
-
if err != nil {
|
58
|
-
return bosherr.WrapError(err, "Harden permissions")
|
59
|
-
}
|
60
|
-
|
61
|
-
return nil
|
62
|
-
}
|
63
|
-
|
64
|
-
func (p VCAPUserProvisioner) setUpVcapUser() error {
|
65
|
-
p.logger.Info(vcapUserProvisionerLogTag, "Setting up vcap user")
|
66
|
-
|
67
|
-
_, stderr, _, err := p.runner.RunCommand("groupadd", "--system", "admin")
|
68
|
-
if err != nil {
|
69
|
-
if !strings.Contains(stderr, "group 'admin' already exists") {
|
70
|
-
return err
|
71
|
-
}
|
72
|
-
}
|
73
|
-
|
74
|
-
_, stderr, _, err = p.runner.RunCommand("useradd", "-m", "--comment", "BOSH System User", "vcap")
|
75
|
-
if err != nil {
|
76
|
-
if !strings.Contains(stderr, "user 'vcap' already exists") {
|
77
|
-
return err
|
78
|
-
}
|
79
|
-
}
|
80
|
-
|
81
|
-
cmds := [][]string{
|
82
|
-
{"bash", "-c", "echo 'vcap:c1oudc0w' | chpasswd"},
|
83
|
-
{"bash", "-c", "echo 'root:c1oudc0w' | chpasswd"},
|
84
|
-
|
85
|
-
{"usermod", "-G", "admin,adm,audio,cdrom,dialout,floppy,video,dip,plugdev", "vcap"},
|
86
|
-
{"usermod", "-s", "/bin/bash", "vcap"},
|
87
|
-
}
|
88
|
-
|
89
|
-
for _, cmd := range cmds {
|
90
|
-
_, _, _, err := p.runner.RunCommand(cmd[0], cmd[1:]...)
|
91
|
-
if err != nil {
|
92
|
-
return err
|
93
|
-
}
|
94
|
-
}
|
95
|
-
|
96
|
-
// todo setup vcap no-password sudo access
|
97
|
-
|
98
|
-
_, stderr, _, err = p.runner.RunCommand("usermod", "-a", "-G", "vcap", "vagrant")
|
99
|
-
if err != nil {
|
100
|
-
if !strings.Contains(stderr, "user 'vagrant' does not exist") {
|
101
|
-
return err
|
102
|
-
}
|
103
|
-
}
|
104
|
-
|
105
|
-
return p.setUpBoshBinPath()
|
106
|
-
}
|
107
|
-
|
108
|
-
func (p VCAPUserProvisioner) setUpBoshBinPath() error {
|
109
|
-
boshBinExport := "export PATH=/var/vcap/bosh/bin:$PATH"
|
110
|
-
|
111
|
-
for _, bashrcPath := range []string{"/root/.bashrc", "/home/vcap/.bashrc"} {
|
112
|
-
contents, err := p.fs.ReadFileString(bashrcPath)
|
113
|
-
if err != nil {
|
114
|
-
return err
|
115
|
-
}
|
116
|
-
|
117
|
-
if !strings.Contains(contents, boshBinExport) {
|
118
|
-
err := p.fs.WriteFileString(bashrcPath, contents+"\n"+boshBinExport+"\n")
|
119
|
-
if err != nil {
|
120
|
-
return err
|
121
|
-
}
|
122
|
-
}
|
123
|
-
}
|
124
|
-
|
125
|
-
return nil
|
126
|
-
}
|
127
|
-
|
128
|
-
func (p VCAPUserProvisioner) configureLocales() error {
|
129
|
-
_, _, _, err := p.runner.RunCommand("locale-gen", "en_US.UTF-8")
|
130
|
-
if err != nil {
|
131
|
-
return err
|
132
|
-
}
|
133
|
-
|
134
|
-
_, _, _, err = p.runner.RunCommand("dpkg-reconfigure", "locales")
|
135
|
-
if err != nil {
|
136
|
-
return err
|
137
|
-
}
|
138
|
-
|
139
|
-
// Configure vcap user locale (postgres initdb fails if mismatched)
|
140
|
-
return p.fs.WriteFileString("/etc/default/locale", "LANG=en_US.UTF-8\nLC_ALL=en_US.UTF-8")
|
141
|
-
}
|
142
|
-
|
143
|
-
func (p VCAPUserProvisioner) hardenPermissinons() error {
|
144
|
-
cmds := [][]string{
|
145
|
-
{"bash", "-c", "echo 'vcap' > /etc/cron.allow"},
|
146
|
-
{"bash", "-c", "echo 'vcap' > /etc/at.allow"},
|
147
|
-
|
148
|
-
{"chmod", "0770", "/var/lock"},
|
149
|
-
{"chown", "-h", "root:vcap", "/var/lock"},
|
150
|
-
{"chown", "-LR", "root:vcap", "/var/lock"},
|
151
|
-
|
152
|
-
{"chmod", "0640", "/etc/cron.allow"},
|
153
|
-
{"chown", "root:vcap", "/etc/cron.allow"},
|
154
|
-
|
155
|
-
{"chmod", "0640", "/etc/at.allow"},
|
156
|
-
{"chown", "root:vcap", "/etc/at.allow"},
|
157
|
-
}
|
158
|
-
|
159
|
-
for _, cmd := range cmds {
|
160
|
-
_, _, _, err := p.runner.RunCommand(cmd[0], cmd[1:]...)
|
161
|
-
if err != nil {
|
162
|
-
return err
|
163
|
-
}
|
164
|
-
}
|
165
|
-
|
166
|
-
return nil
|
167
|
-
}
|
@@ -1,119 +0,0 @@
|
|
1
|
-
package vagrant
|
2
|
-
|
3
|
-
import (
|
4
|
-
bosherr "bosh/errors"
|
5
|
-
boshlog "bosh/logger"
|
6
|
-
|
7
|
-
bpdep "boshprovisioner/deployment"
|
8
|
-
bpvm "boshprovisioner/vm"
|
9
|
-
)
|
10
|
-
|
11
|
-
var (
|
12
|
-
ErrAlreadyProvisioned = bosherr.New("Vagrant VM is already provisioned")
|
13
|
-
ErrNotProvisioned = bosherr.New("Vagrant VM is not provisioned")
|
14
|
-
)
|
15
|
-
|
16
|
-
// VMProvisioner installs system dependencies that are usually
|
17
|
-
// found on a stemcell, adds vcap user and finally install Agent and Monit.
|
18
|
-
type VMProvisioner struct {
|
19
|
-
vcapUserProvisioner VCAPUserProvisioner
|
20
|
-
depsProvisioner DepsProvisioner
|
21
|
-
agentProvisioner AgentProvisioner
|
22
|
-
|
23
|
-
// Cannot provision more than 1 VM at a time until previous VM is deprovisioned.
|
24
|
-
vmProvisioned bool
|
25
|
-
|
26
|
-
// Remember if we have recently run provisioning for a VM to skip it next time.
|
27
|
-
vmPreviouslyProvisioned bool
|
28
|
-
|
29
|
-
logger boshlog.Logger
|
30
|
-
}
|
31
|
-
|
32
|
-
type vagrantVM interface {
|
33
|
-
vagrantVM()
|
34
|
-
}
|
35
|
-
|
36
|
-
func NewVMProvisioner(
|
37
|
-
vcapUserProvisioner VCAPUserProvisioner,
|
38
|
-
depsProvisioner DepsProvisioner,
|
39
|
-
agentProvisioner AgentProvisioner,
|
40
|
-
logger boshlog.Logger,
|
41
|
-
) *VMProvisioner {
|
42
|
-
return &VMProvisioner{
|
43
|
-
vcapUserProvisioner: vcapUserProvisioner,
|
44
|
-
depsProvisioner: depsProvisioner,
|
45
|
-
agentProvisioner: agentProvisioner,
|
46
|
-
|
47
|
-
logger: logger,
|
48
|
-
}
|
49
|
-
}
|
50
|
-
|
51
|
-
func (p *VMProvisioner) Provision(instance bpdep.Instance) (bpvm.VM, error) {
|
52
|
-
if p.vmProvisioned {
|
53
|
-
return nil, ErrAlreadyProvisioned
|
54
|
-
}
|
55
|
-
|
56
|
-
err := p.provisionNonConfigured()
|
57
|
-
if err != nil {
|
58
|
-
return nil, err
|
59
|
-
}
|
60
|
-
|
61
|
-
agentClient, err := p.agentProvisioner.Configure(instance)
|
62
|
-
if err != nil {
|
63
|
-
return nil, bosherr.WrapError(err, "Configuring agent")
|
64
|
-
}
|
65
|
-
|
66
|
-
// Set this as late as possible so that caller can retry failed provisioning attempts.
|
67
|
-
p.vmProvisioned = true
|
68
|
-
|
69
|
-
return NewConfiguredVM(p, agentClient), nil
|
70
|
-
}
|
71
|
-
|
72
|
-
func (p *VMProvisioner) ProvisionNonConfigured() (bpvm.VM, error) {
|
73
|
-
if p.vmProvisioned {
|
74
|
-
return nil, ErrAlreadyProvisioned
|
75
|
-
}
|
76
|
-
|
77
|
-
err := p.provisionNonConfigured()
|
78
|
-
if err != nil {
|
79
|
-
return nil, err
|
80
|
-
}
|
81
|
-
|
82
|
-
// Set this as late as possible so that caller can retry failed provisioning attempts.
|
83
|
-
p.vmProvisioned = true
|
84
|
-
|
85
|
-
return NewNonConfiguredVM(p), nil
|
86
|
-
}
|
87
|
-
|
88
|
-
func (p *VMProvisioner) deprovision(vm vagrantVM) error {
|
89
|
-
if !p.vmProvisioned {
|
90
|
-
return ErrNotProvisioned
|
91
|
-
}
|
92
|
-
|
93
|
-
p.vmProvisioned = false
|
94
|
-
|
95
|
-
return nil
|
96
|
-
}
|
97
|
-
|
98
|
-
func (p *VMProvisioner) provisionNonConfigured() error {
|
99
|
-
if !p.vmPreviouslyProvisioned {
|
100
|
-
err := p.vcapUserProvisioner.Provision()
|
101
|
-
if err != nil {
|
102
|
-
return bosherr.WrapError(err, "Provisioning vcap user")
|
103
|
-
}
|
104
|
-
|
105
|
-
err = p.depsProvisioner.Provision()
|
106
|
-
if err != nil {
|
107
|
-
return bosherr.WrapError(err, "Provisioning dependencies")
|
108
|
-
}
|
109
|
-
}
|
110
|
-
|
111
|
-
p.vmPreviouslyProvisioned = true
|
112
|
-
|
113
|
-
err := p.agentProvisioner.Provision()
|
114
|
-
if err != nil {
|
115
|
-
return bosherr.WrapError(err, "Provisioning agent")
|
116
|
-
}
|
117
|
-
|
118
|
-
return nil
|
119
|
-
}
|
@@ -1,101 +0,0 @@
|
|
1
|
-
package vagrant
|
2
|
-
|
3
|
-
import (
|
4
|
-
boshlog "bosh/logger"
|
5
|
-
boshsys "bosh/system"
|
6
|
-
|
7
|
-
bpeventlog "boshprovisioner/eventlog"
|
8
|
-
bpvm "boshprovisioner/vm"
|
9
|
-
)
|
10
|
-
|
11
|
-
type VMProvisionerFactory struct {
|
12
|
-
fs boshsys.FileSystem
|
13
|
-
runner boshsys.CmdRunner
|
14
|
-
|
15
|
-
assetsDir string
|
16
|
-
mbus string
|
17
|
-
|
18
|
-
blobstoreConfig map[string]interface{}
|
19
|
-
vmProvisionerConfig bpvm.VMProvisionerConfig
|
20
|
-
|
21
|
-
eventLog bpeventlog.Log
|
22
|
-
logger boshlog.Logger
|
23
|
-
}
|
24
|
-
|
25
|
-
func NewVMProvisionerFactory(
|
26
|
-
fs boshsys.FileSystem,
|
27
|
-
runner boshsys.CmdRunner,
|
28
|
-
assetsDir string,
|
29
|
-
blobstoreConfig map[string]interface{},
|
30
|
-
vmProvisionerConfig bpvm.VMProvisionerConfig,
|
31
|
-
eventLog bpeventlog.Log,
|
32
|
-
logger boshlog.Logger,
|
33
|
-
) VMProvisionerFactory {
|
34
|
-
return VMProvisionerFactory{
|
35
|
-
fs: fs,
|
36
|
-
runner: runner,
|
37
|
-
|
38
|
-
assetsDir: assetsDir,
|
39
|
-
blobstoreConfig: blobstoreConfig,
|
40
|
-
vmProvisionerConfig: vmProvisionerConfig,
|
41
|
-
|
42
|
-
eventLog: eventLog,
|
43
|
-
logger: logger,
|
44
|
-
}
|
45
|
-
}
|
46
|
-
|
47
|
-
func (f VMProvisionerFactory) NewVMProvisioner() *VMProvisioner {
|
48
|
-
cmds := NewSimpleCmds(f.runner, f.logger)
|
49
|
-
|
50
|
-
vcapUserProvisioner := NewVCAPUserProvisioner(
|
51
|
-
f.fs,
|
52
|
-
f.runner,
|
53
|
-
f.eventLog,
|
54
|
-
f.logger,
|
55
|
-
)
|
56
|
-
|
57
|
-
assetManager := NewAssetManager(f.assetsDir, f.fs, f.runner, f.logger)
|
58
|
-
|
59
|
-
runitProvisioner := NewRunitProvisioner(
|
60
|
-
f.fs,
|
61
|
-
cmds,
|
62
|
-
f.runner,
|
63
|
-
assetManager,
|
64
|
-
f.logger,
|
65
|
-
)
|
66
|
-
|
67
|
-
monitProvisioner := NewMonitProvisioner(
|
68
|
-
cmds,
|
69
|
-
assetManager,
|
70
|
-
runitProvisioner,
|
71
|
-
f.logger,
|
72
|
-
)
|
73
|
-
|
74
|
-
depsProvisioner := NewDepsProvisioner(
|
75
|
-
f.vmProvisionerConfig.FullStemcellCompatibility,
|
76
|
-
f.runner,
|
77
|
-
f.eventLog,
|
78
|
-
f.logger,
|
79
|
-
)
|
80
|
-
|
81
|
-
agentProvisioner := NewAgentProvisioner(
|
82
|
-
f.fs,
|
83
|
-
cmds,
|
84
|
-
assetManager,
|
85
|
-
runitProvisioner,
|
86
|
-
monitProvisioner,
|
87
|
-
f.blobstoreConfig,
|
88
|
-
f.vmProvisionerConfig.AgentProvisioner,
|
89
|
-
f.eventLog,
|
90
|
-
f.logger,
|
91
|
-
)
|
92
|
-
|
93
|
-
vmProvisioner := NewVMProvisioner(
|
94
|
-
vcapUserProvisioner,
|
95
|
-
depsProvisioner,
|
96
|
-
agentProvisioner,
|
97
|
-
f.logger,
|
98
|
-
)
|
99
|
-
|
100
|
-
return vmProvisioner
|
101
|
-
}
|
@@ -1,45 +0,0 @@
|
|
1
|
-
package vm
|
2
|
-
|
3
|
-
import (
|
4
|
-
bpagclient "boshprovisioner/agent/client"
|
5
|
-
bpdep "boshprovisioner/deployment"
|
6
|
-
)
|
7
|
-
|
8
|
-
type VMProvisioner interface {
|
9
|
-
// Provision creates and configures VM for future agent communication.
|
10
|
-
// todo should not rely on bpdep.Instance
|
11
|
-
Provision(bpdep.Instance) (VM, error)
|
12
|
-
|
13
|
-
// ProvisionNonConfigured creates and does NOT configure VM for communication.
|
14
|
-
ProvisionNonConfigured() (VM, error)
|
15
|
-
}
|
16
|
-
|
17
|
-
type VM interface {
|
18
|
-
// AgentClient returns a client immediately ready for communication.
|
19
|
-
AgentClient() bpagclient.Client
|
20
|
-
|
21
|
-
// Deprovision deletes VM previously provisioned VM.
|
22
|
-
Deprovision() error
|
23
|
-
}
|
24
|
-
|
25
|
-
type VMProvisionerConfig struct {
|
26
|
-
// When provisioning, install all dependencies that official stemcells carry.
|
27
|
-
// By default, provisioners will only install absolutely needed dependencies.
|
28
|
-
FullStemcellCompatibility bool `json:"full_stemcell_compatibility"`
|
29
|
-
|
30
|
-
AgentProvisioner AgentProvisionerConfig `json:"agent_provisioner"`
|
31
|
-
}
|
32
|
-
|
33
|
-
type AgentProvisionerConfig struct {
|
34
|
-
// e.g. warden, aws
|
35
|
-
Infrastructure string `json:"infrastructure"`
|
36
|
-
|
37
|
-
// e.g. ubuntu, centos
|
38
|
-
Platform string `json:"platform"`
|
39
|
-
|
40
|
-
// Usually save to /var/vcap/bosh/agent.json
|
41
|
-
Configuration map[string]interface{} `json:"configuration"`
|
42
|
-
|
43
|
-
// e.g. "https://user:password@127.0.0.1:4321/agent"
|
44
|
-
Mbus string `json:"mbus"`
|
45
|
-
}
|