- Clear out some cruft tightly coupling libmachine to filestore - Comment out drivers other than virtualbox for now - Change way too many things - Mostly, break out the code to be more modular. - Destroy all traces of "provider" in its current form. It will be brought back as something more sensible, instead of something which overlaps in function with both Host and Store. - Fix mis-managed config passthru - Remove a few instances of state stored in env vars - This should be explicitly communicated in Go-land, not through the shell. - Rename "store" module to "persist" - This is done mostly to avoid confusion about the fact that a concrete instance of a "Store" interface is oftentimes referred to as "store" in the code. - Rip out repetitive antipattern for getting store - This replaces the previous repetive idiom for getting the cert info, and consequently the store, with a much less repetitive idiom. - Also, some redundant methods in commands.go for accessing hosts have either been simplified or removed entirely. - First steps towards fixing up tests - Test progress continues - Replace unit tests with integration tests - MAKE ALL UNIT TESTS PASS YAY - Add helper test files - Don't write to disk in libmachine/host - Heh.. coverage check strikes again - Fix remove code - Move cert code around - Continued progress: simplify Driver - Fixups and make creation work with new model - Move drivers module inside of libmachine - Move ssh module inside of libmachine - Move state module to libmachine - Move utils module to libmachine - Move version module to libmachine - Move log module to libmachine - Modify some constructor methods around - Change Travis build dep structure - Boring gofmt fix - Add version module - Move NewHost to store - Update some boring cert path infos to make API easier to use - Fix up some issues around the new model - Clean up some cert path stuff - Don't use shady functions to get store path :D - Continue artifact work - Fix silly machines dir bug - Continue fixing silly path issues - Change up output of vbm a bit - Continue work to make example go - Change output a little more - Last changes needed to make create finish properly - Fix config.go to use libmachine - Cut down code duplication and make both methods work with libmachine - Add pluggable logging implementation - Return error when machine already in desired state - Update example to show log method - Fix file:// bug - Fix Swarm defaults - Remove unused TLS settings from Engine and Swarm options - Remove spurious error - Correct bug detecting if migration was performed - Fix compilation errors from tests - Fix most of remaining test issues - Fix final silly bug in tests - Remove extraneous debug code - Add -race to test command - Appease the gofmt - Appease the generate coverage - Making executive decision to remove Travis coverage check In the early days I thought this would be a good idea because it would encourage people to write tests in case they added a new module. Well, in fact it has just turned into a giant nuisance and made refactoring work like this even more difficult. - Move Get to Load - Move HostListItem code to CLI Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
123 lines
3.5 KiB
Go
123 lines
3.5 KiB
Go
package provision
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"text/template"
|
|
|
|
"github.com/docker/machine/libmachine/auth"
|
|
"github.com/docker/machine/libmachine/drivers"
|
|
"github.com/docker/machine/libmachine/engine"
|
|
"github.com/docker/machine/libmachine/swarm"
|
|
)
|
|
|
|
type GenericProvisioner struct {
|
|
OsReleaseId string
|
|
DockerOptionsDir string
|
|
DaemonOptionsFile string
|
|
Packages []string
|
|
OsReleaseInfo *OsRelease
|
|
Driver drivers.Driver
|
|
AuthOptions auth.AuthOptions
|
|
EngineOptions engine.EngineOptions
|
|
SwarmOptions swarm.SwarmOptions
|
|
}
|
|
|
|
func (provisioner *GenericProvisioner) Hostname() (string, error) {
|
|
return provisioner.SSHCommand("hostname")
|
|
}
|
|
|
|
func (provisioner *GenericProvisioner) SetHostname(hostname string) error {
|
|
if _, err := provisioner.SSHCommand(fmt.Sprintf(
|
|
"sudo hostname %s && echo %q | sudo tee /etc/hostname",
|
|
hostname,
|
|
hostname,
|
|
)); err != nil {
|
|
return err
|
|
}
|
|
|
|
// ubuntu/debian use 127.0.1.1 for non "localhost" loopback hostnames: https://www.debian.org/doc/manuals/debian-reference/ch05.en.html#_the_hostname_resolution
|
|
if _, err := provisioner.SSHCommand(fmt.Sprintf(
|
|
"if grep -xq 127.0.1.1.* /etc/hosts; then sudo sed -i 's/^127.0.1.1.*/127.0.1.1 %s/g' /etc/hosts; else echo '127.0.1.1 %s' | sudo tee -a /etc/hosts; fi",
|
|
hostname,
|
|
hostname,
|
|
)); err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (provisioner *GenericProvisioner) GetDockerOptionsDir() string {
|
|
return provisioner.DockerOptionsDir
|
|
}
|
|
|
|
func (provisioner *GenericProvisioner) SSHCommand(args string) (string, error) {
|
|
return drivers.RunSSHCommandFromDriver(provisioner.Driver, args)
|
|
}
|
|
|
|
func (provisioner *GenericProvisioner) CompatibleWithHost() bool {
|
|
return provisioner.OsReleaseInfo.Id == provisioner.OsReleaseId
|
|
}
|
|
|
|
func (provisioner *GenericProvisioner) GetAuthOptions() auth.AuthOptions {
|
|
return provisioner.AuthOptions
|
|
}
|
|
|
|
func (provisioner *GenericProvisioner) SetOsReleaseInfo(info *OsRelease) {
|
|
provisioner.OsReleaseInfo = info
|
|
}
|
|
|
|
func (provisioner *GenericProvisioner) GetOsReleaseInfo() (*OsRelease, error) {
|
|
return provisioner.OsReleaseInfo, nil
|
|
}
|
|
|
|
func (provisioner *GenericProvisioner) GenerateDockerOptions(dockerPort int) (*DockerOptions, error) {
|
|
var (
|
|
engineCfg bytes.Buffer
|
|
)
|
|
|
|
driverNameLabel := fmt.Sprintf("provider=%s", provisioner.Driver.DriverName())
|
|
provisioner.EngineOptions.Labels = append(provisioner.EngineOptions.Labels, driverNameLabel)
|
|
|
|
engineConfigTmpl := `
|
|
DOCKER_OPTS='
|
|
-H tcp://0.0.0.0:{{.DockerPort}}
|
|
-H unix:///var/run/docker.sock
|
|
--storage-driver {{.EngineOptions.StorageDriver}}
|
|
--tlsverify
|
|
--tlscacert {{.AuthOptions.CaCertRemotePath}}
|
|
--tlscert {{.AuthOptions.ServerCertRemotePath}}
|
|
--tlskey {{.AuthOptions.ServerKeyRemotePath}}
|
|
{{ range .EngineOptions.Labels }}--label {{.}}
|
|
{{ end }}{{ range .EngineOptions.InsecureRegistry }}--insecure-registry {{.}}
|
|
{{ end }}{{ range .EngineOptions.RegistryMirror }}--registry-mirror {{.}}
|
|
{{ end }}{{ range .EngineOptions.ArbitraryFlags }}--{{.}}
|
|
{{ end }}
|
|
'
|
|
{{range .EngineOptions.Env}}export \"{{ printf "%q" . }}\"
|
|
{{end}}
|
|
`
|
|
t, err := template.New("engineConfig").Parse(engineConfigTmpl)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
engineConfigContext := EngineConfigContext{
|
|
DockerPort: dockerPort,
|
|
AuthOptions: provisioner.AuthOptions,
|
|
EngineOptions: provisioner.EngineOptions,
|
|
}
|
|
|
|
t.Execute(&engineCfg, engineConfigContext)
|
|
|
|
return &DockerOptions{
|
|
EngineOptions: engineCfg.String(),
|
|
EngineOptionsPath: provisioner.DaemonOptionsFile,
|
|
}, nil
|
|
}
|
|
|
|
func (provisioner *GenericProvisioner) GetDriver() drivers.Driver {
|
|
return provisioner.Driver
|
|
}
|