瀏覽代碼

Merge pull request #1152 from richardkchapman/ftslavefix

Revert the change that removed ftslave from environment
Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday 13 年之前
父節點
當前提交
852efe6704
共有 2 個文件被更改,包括 13 次插入2 次删除
  1. 11 0
      initfiles/etc/DIR_NAME/environment.xml.in
  2. 2 2
      initfiles/etc/DIR_NAME/genenvrules.conf

+ 11 - 0
initfiles/etc/DIR_NAME/environment.xml.in

@@ -960,6 +960,17 @@
                          service="ecldirect"/>
    </Properties>
   </EspService>
+  <FTSlaveProcess build="${CPACK_RPM_PACKAGE_VERSION}_${CPACK_RPM_PACKAGE_RELEASE}"
+                  buildSet="ftslave"
+                  description="FTSlave process"
+                  name="myftslave"
+                  version="1">
+   <Instance computer="localhost"
+             directory="${RUNTIME_PATH}/myftslave"
+             name="s1"
+             netAddress="."
+             program="${EXEC_PATH}/ftslave"/>
+  </FTSlaveProcess>
   <PluginProcess build="${CPACK_RPM_PACKAGE_VERSION}_${CPACK_RPM_PACKAGE_RELEASE}"
                  buildSet="plugins_auditlib"
                  description="plugin process"

+ 2 - 2
initfiles/etc/DIR_NAME/genenvrules.conf

@@ -1,9 +1,9 @@
 
 [Algorithm]
 max_comps_per_node=4
-do_not_generate=SiteCertificate,dfuplus,soapplus,eclplus,ldapServer,ws_account,eclserver,ftslave
+do_not_generate=SiteCertificate,dfuplus,soapplus,eclplus,ldapServer,ws_account,eclserver
 avoid_combo=dali-eclagent
-comps_on_all_nodes=dafilesrv
+comps_on_all_nodes=dafilesrv,ftslave
 topology_for_comps=thor,hthor,roxie
 do_not_gen_optional=dali,thor
 roxie_agent_redundancy=1,2,1