|
@@ -292,10 +292,6 @@ func (daemon *Daemon) UpdateContainerServiceConfig(containerName string, service
|
|
return nil
|
|
return nil
|
|
}
|
|
}
|
|
|
|
|
|
-func errClusterNetworkConnect() error {
|
|
|
|
- return fmt.Errorf("cannot connect or disconnect managed containers on a network")
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
// ConnectContainerToNetwork connects the given container to the given
|
|
// ConnectContainerToNetwork connects the given container to the given
|
|
// network. If either cannot be found, an err is returned. If the
|
|
// network. If either cannot be found, an err is returned. If the
|
|
// network cannot be set up, an err is returned.
|
|
// network cannot be set up, an err is returned.
|
|
@@ -304,9 +300,6 @@ func (daemon *Daemon) ConnectContainerToNetwork(containerName, networkName strin
|
|
if err != nil {
|
|
if err != nil {
|
|
return err
|
|
return err
|
|
}
|
|
}
|
|
- if container.Managed {
|
|
|
|
- return errClusterNetworkConnect()
|
|
|
|
- }
|
|
|
|
return daemon.ConnectToNetwork(container, networkName, endpointConfig)
|
|
return daemon.ConnectToNetwork(container, networkName, endpointConfig)
|
|
}
|
|
}
|
|
|
|
|
|
@@ -320,9 +313,6 @@ func (daemon *Daemon) DisconnectContainerFromNetwork(containerName string, netwo
|
|
}
|
|
}
|
|
return err
|
|
return err
|
|
}
|
|
}
|
|
- if container.Managed {
|
|
|
|
- return errClusterNetworkConnect()
|
|
|
|
- }
|
|
|
|
return daemon.DisconnectFromNetwork(container, network, force)
|
|
return daemon.DisconnectFromNetwork(container, network, force)
|
|
}
|
|
}
|
|
|
|
|