Salt configuration for flanneld

This commit is contained in:
Prashanth Balasubramanian
2015-09-06 11:10:33 -07:00
committed by gmarek
parent a7425bf070
commit 4cd1ee177b
9 changed files with 206 additions and 6 deletions

View File

@@ -292,7 +292,8 @@ func (s *CMServer) Run(_ []string) error {
}
if s.AllocateNodeCIDRs {
if cloud == nil {
// TODO: Pipe this as a command line flag that corresponds to overlay==true
if cloud == nil || true {
glog.Warning("allocate-node-cidrs is set, but no cloud provider specified. Will not manage routes.")
} else if routes, ok := cloud.Routes(); !ok {
glog.Warning("allocate-node-cidrs is set, but cloud provider does not support routes. Will not manage routes.")