alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove refs to vbox and just use vagrant (#852)

Browse Source
This commit is contained in:
Faiq Raza
2018-03-14 08:56:17 -07:00
committed by GitHub
parent b41f320284
commit e02a2e08d9
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
poolmanager/server/controlplane/vagrant_plugin/vbox.go → poolmanager/server/controlplane/vagrant_plugin/vagrant.go
View File

@@ -18,7 +18,7 @@ import (
const ( const (
vagrantEnv = "VAGRANT_PATH" vagrantEnv = "VAGRANT_PATH"
vboxNamePrefix = "fn-vagrant" vagrantNamePrefix = "fn-vagrant"
) )
func init() { func init() {
@@ -26,7 +26,7 @@ func init() {
if !ok { if !ok {
log.Panicf("Missing config key: %v", vagrantEnv) log.Panicf("Missing config key: %v", vagrantEnv)
} }
ControlPlane = VirtualBoxCP{ ControlPlane = VagrantCP{
runnerMap: make(map[string][]*controlplane.Runner), runnerMap: make(map[string][]*controlplane.Runner),
vagrantPath: vagrantPath, vagrantPath: vagrantPath,
} }
@@ -35,12 +35,12 @@ func init() {
func main() { func main() {
} }
type VirtualBoxCP struct { type VagrantCP struct {
runnerMap map[string][]*controlplane.Runner runnerMap map[string][]*controlplane.Runner
vagrantPath string vagrantPath string
} }
func (v *VirtualBoxCP) provision() (*controlplane.Runner, error) { func (v *VagrantCP) provision() (*controlplane.Runner, error) {
//set up dir //set up dir
wd, err := os.Getwd() wd, err := os.Getwd()
if err != nil { if err != nil {
@@ -67,8 +67,8 @@ func (v *VirtualBoxCP) provision() (*controlplane.Runner, error) {
log.Println(err.Error()) log.Println(err.Error())
return nil, err return nil, err
} }
vboxProvision := exec.Command("vagrant", "up") vagrantUp := exec.Command("vagrant", "up")
err = vboxProvision.Run() err = vagrantUp.Run()
if err != nil { if err != nil {
log.Println(err.Error()) log.Println(err.Error())
return nil, err return nil, err
@@ -125,7 +125,7 @@ func getRunner(node string) (*controlplane.Runner, error) {
}, nil }, nil
} }
func (v *VirtualBoxCP) GetLBGRunners(lgbID string) ([]*controlplane.Runner, error) { func (v *VagrantCP) GetLBGRunners(lgbID string) ([]*controlplane.Runner, error) {
runners, ok := v.runnerMap[lgbID] runners, ok := v.runnerMap[lgbID]
if !ok { if !ok {
return nil, errors.New("Not Found") return nil, errors.New("Not Found")
@@ -133,7 +133,7 @@ func (v *VirtualBoxCP) GetLBGRunners(lgbID string) ([]*controlplane.Runner, erro
return runners, nil return runners, nil
} }
func (v *VirtualBoxCP) ProvisionRunners(lgbID string, n int) (int, error) { func (v *VagrantCP) ProvisionRunners(lgbID string, n int) (int, error) {
runners := make([]*controlplane.Runner, 0, n) runners := make([]*controlplane.Runner, 0, n)
for i := 0; i < n; i++ { for i := 0; i < n; i++ {
runner, err := v.provision() runner, err := v.provision()
@@ -146,7 +146,7 @@ func (v *VirtualBoxCP) ProvisionRunners(lgbID string, n int) (int, error) {
return n, nil return n, nil
} }
func (v *VirtualBoxCP) RemoveRunner(lbgID string, id string) error { func (v *VagrantCP) RemoveRunner(lbgID string, id string) error {
wd, err := os.Getwd() wd, err := os.Getwd()
if err != nil { if err != nil {
return err return err
@@ -199,7 +199,7 @@ func (v *VirtualBoxCP) RemoveRunner(lbgID string, id string) error {
func newNodeName() string { func newNodeName() string {
id := idgen.New() id := idgen.New()
return fmt.Sprintf("%s-%s", vboxNamePrefix, id.String()) return fmt.Sprintf("%s-%s", vagrantNamePrefix, id.String())
} }
//TODO move to a util folder if needed again //TODO move to a util folder if needed again
@@ -228,4 +228,4 @@ func copyFile(src string, dst string) error {
return d.Close() return d.Close()
} }
var ControlPlane VirtualBoxCP var ControlPlane VagrantCP