Merge pull request #1609 from smeda/issue1573

WIP #1573 Remove Thor slaves and spares from configgen output

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

deployment/configgen/main.cpp

@@ -350,7 +350,7 @@ int processRequest(const char* in_cfgname, const char* out_dirname, const char*
               isMaster = true;
               out.appendf("%s=%s;%s%c%s;%s\n", pComponent->queryProp("@name"), pComponent->queryProp("@buildSet"), out_dirname, PATHSEPCHAR, pComponent->queryProp("@name"),"master");
             }
-            else if (!strcmp(instName.toCharArray(), "ThorSlaveProcess") || !strcmp(instName.toCharArray(), "RoxieSlaveProcess"))
+            else if (!strcmp(instName.toCharArray(), "RoxieSlaveProcess"))
               sbChildren.appendf("%s=%s;%s%c%s;%s\n", pComponent->queryProp("@name"), pComponent->queryProp("@buildSet"), out_dirname, PATHSEPCHAR, pComponent->queryProp("@name"),"slave");
           }
 
@@ -380,6 +380,10 @@ int processRequest(const char* in_cfgname, const char* out_dirname, const char*
           ForEach(*itComp)
           {
             IPropertyTree* pInst = &itComp->query();
+
+            if (!strcmp(pInst->queryName(), "ThorSlaveProcess") || !strcmp(pInst->queryName(), "ThorSpareProcess"))
+              continue;
+
             netAddr.clear().append(pInst->queryProp("@netAddress"));
             port.clear().append(pInst->queryProp("@port"));