From 36dbabd7d2ddd02fa50f78c33c5adec09fcaffe0 Mon Sep 17 00:00:00 2001 From: Kasra Bigdeli Date: Fri, 15 Dec 2017 13:18:43 -0800 Subject: [PATCH] Allowing nodeId to be changed for persistent containers. --- app-backend/src/user/ServiceManager.js | 29 +++++++++----------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/app-backend/src/user/ServiceManager.js b/app-backend/src/user/ServiceManager.js index 21f7c8d..c312dd0 100644 --- a/app-backend/src/user/ServiceManager.js +++ b/app-backend/src/user/ServiceManager.js @@ -657,29 +657,20 @@ class ServiceManager { if (nodeId) { - if (app.nodeId) { + return dockerApi + .getNodesInfo() + .then(function (nodeInfo) { - if (nodeId !== app.nodeId) { - throw ApiStatusCodes.createError(ApiStatusCodes.ILLEGAL_OPERATION, "Cannot change Node ID after it's set!"); - } - - } - else { - - return dockerApi - .getNodesInfo() - .then(function (nodeInfo) { - - for (let i = 0; i < nodeInfo.length; i++) { - if (nodeId === nodeInfo[i].nodeId) { - return; - } + for (let i = 0; i < nodeInfo.length; i++) { + if (nodeId === nodeInfo[i].nodeId) { + return; } + } - throw ApiStatusCodes.createError(ApiStatusCodes.STATUS_ERROR_GENERIC, "Node ID you requested in not part of the swarm " + nodeId); + throw ApiStatusCodes.createError(ApiStatusCodes.STATUS_ERROR_GENERIC, "Node ID you requested in not part of the swarm " + nodeId); + + }); - }) - } } else {