Merge pull request #1631 from lavalamp/fix

Fix build error in integration test
pull/6/head
Daniel Smith 2014-10-07 13:22:12 -07:00
commit a6c748451d
2 changed files with 7 additions and 1 deletions

View File

@ -136,7 +136,12 @@ func startComponents(manifestURL string) (apiServerURL string) {
handler.delegate = mux
// Scheduler
scheduler.New((&factory.ConfigFactory{cl}).Create()).Run()
schedulerConfigFactory := &factory.ConfigFactory{cl}
schedulerConfig, err := schedulerConfigFactory.Create()
if err != nil {
glog.Fatalf("Unable to construct scheduler config: %v", err)
}
scheduler.New(schedulerConfig).Run()
endpoints := service.NewEndpointController(cl)
go util.Forever(func() { endpoints.SyncServiceEndpoints() }, time.Second*10)

View File

@ -64,6 +64,7 @@ func (factory *ConfigFactory) Create() (*scheduler.Config, error) {
r := rand.New(rand.NewSource(time.Now().UnixNano()))
// TODO: remove this construction-time listing.
nodes, err := factory.Client.ListMinions()
if err != nil {
return nil, err