Merge pull request #28804 from bfirsh/better-service-network-overlay-error-message

Improve error when connecting service to network
This commit is contained in:
Justin Cormack 2016-11-24 09:06:51 -08:00 коммит произвёл GitHub
Родитель 82c858c8b6 70acb89fa2
Коммит 8602d97835
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -1764,7 +1764,7 @@ func (c *Cluster) populateNetworkID(ctx context.Context, client swarmapi.Control
apiNetwork, err := getNetwork(ctx, client, n.Target)
if err != nil {
if ln, _ := c.config.Backend.FindNetwork(n.Target); ln != nil && !ln.Info().Dynamic() {
err = fmt.Errorf("network %s is not eligible for docker services", ln.Name())
err = fmt.Errorf("The network %s cannot be used with services. Only networks scoped to the swarm can be used, such as those created with the overlay driver.", ln.Name())
return apierrors.NewRequestForbiddenError(err)
}
return err