DOCKER-901: docker -p causes assertion failure without fabrics enabled

TritonDataCenter · Aug 1, 2016 · 8dd03e9 · 8dd03e9
1 parent fb28f83
commit 8dd03e9
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/backends/sdc/containers.js b/lib/backends/sdc/containers.js
@@ -1959,8 +1959,12 @@ function buildVmPayload(opts, container, callback) {
         },
 
         function addExternalNet(_, cb) {
-            if (publishingPorts(container) || opts.fabricRequireExternal) {
-                assert.object(opts.config.overlay, 'opts.config.overlay');
+            assert.object(opts.config, 'config');
+            assert.object(opts.config.overlay, 'config.overlay');
+            assert.bool(opts.config.overlay.enabled,
+                'config.overlay.enabled');
+            if (opts.config.overlay.enabled
+                && (publishingPorts(container) || opts.fabricRequireExternal)) {
                 assert.string(opts.config.overlay.externalPool,
                     'opts.config.overlay.externalPool');
                 // external must be primary.