diff --git a/app/components/networks/networks.html b/app/components/networks/networks.html index b7e853f0a..6a558690d 100644 --- a/app/components/networks/networks.html +++ b/app/components/networks/networks.html @@ -47,7 +47,7 @@ -
+
Note: The network will be created using the overlay driver and will allow containers to communicate across the hosts of your cluster.
diff --git a/app/components/networks/networksController.js b/app/components/networks/networksController.js index bf1855fe7..d01623177 100644 --- a/app/components/networks/networksController.js +++ b/app/components/networks/networksController.js @@ -1,6 +1,6 @@ angular.module('networks', []) -.controller('NetworksController', ['$scope', '$state', 'Network', 'Messages', 'errorMsgFilter', -function ($scope, $state, Network, Messages, errorMsgFilter) { +.controller('NetworksController', ['$scope', '$state', 'Network', 'Config', 'Messages', 'errorMsgFilter', +function ($scope, $state, Network, Config, Messages, errorMsgFilter) { $scope.state = {}; $scope.state.selectedItemCount = 0; $scope.state.advancedSettings = false; @@ -46,7 +46,9 @@ function ($scope, $state, Network, Messages, errorMsgFilter) { function prepareNetworkConfiguration() { var config = angular.copy($scope.config); prepareIPAMConfiguration(config); - config.Driver = 'overlay'; + if ($scope.swarm) { + config.Driver = 'overlay'; + } return config; } @@ -108,5 +110,9 @@ function ($scope, $state, Network, Messages, errorMsgFilter) { $('#loadNetworksSpinner').hide(); }); } - fetchNetworks(); + + Config.$promise.then(function (c) { + $scope.swarm = c.swarm; + fetchNetworks(); + }); }]);