re-enable without -m/-c

This commit is contained in:
Victor Vieux 2014-11-20 01:16:19 +00:00
parent 8293b09a15
commit 4f5126a605
1 changed files with 2 additions and 1 deletions

View File

@ -1,7 +1,6 @@
package scheduler
import (
"fmt"
"sync"
"github.com/docker/swarm/cluster"
@ -43,9 +42,11 @@ func (s *Scheduler) selectNodeForContainer(config *dockerclient.ContainerConfig)
// Schedule a brand new container into the cluster.
func (s *Scheduler) CreateContainer(config *dockerclient.ContainerConfig, name string) (*cluster.Container, error) {
/*Disable for now
if config.Memory == 0 || config.CpuShares == 0 {
return nil, fmt.Errorf("Creating containers in clustering mode requires resource constraints (-c and -m) to be set")
}
*/
s.Lock()
defer s.Unlock()