From e4514c81f4cad0fbb3e40c0ce480a89a2783068e Mon Sep 17 00:00:00 2001 From: david hill Date: Thu, 31 Mar 2016 13:47:58 -0500 Subject: [PATCH] fix addmodule issue --- procmgr/processmanager.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/procmgr/processmanager.cpp b/procmgr/processmanager.cpp index 5aaf61a8c..eb0dfee2a 100644 --- a/procmgr/processmanager.cpp +++ b/procmgr/processmanager.cpp @@ -4959,6 +4959,8 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str if ( MySQLPort.empty() || MySQLPort == "" || MySQLPort == oam::UnassignedName ) MySQLPort = "3306"; + string version = systemsoftware.Version + "-" + systemsoftware.Release; + //setup and push custom OS files listPT = devicenetworklist.begin(); for( ; listPT != devicenetworklist.end() ; listPT++) @@ -5025,7 +5027,7 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str if ( packageType != "binary" ) { log.writeLog(__LINE__, "addModule - user_installer run for " + remoteModuleName, LOG_TYPE_DEBUG); - string cmd = installDir + "/bin/user_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + calpontPackage + " " + calpontPackage1 + " " + calpontPackage2 + " " + mysqlPackage + " " + mysqldPackage + " initial " + packageType + " --nodeps none " + MySQLPort + " 1 > /tmp/user_installer.log"; + string cmd = installDir + "/bin/user_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + version + " initial " + packageType + " --nodeps none " + MySQLPort + " 1 > /tmp/user_installer.log"; log.writeLog(__LINE__, "addModule cmd: " + cmd, LOG_TYPE_DEBUG); @@ -5063,7 +5065,7 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str if ( remoteModuleType == "pm" ) { if ( packageType != "binary" ) { log.writeLog(__LINE__, "addModule - performance_installer run for " + remoteModuleName, LOG_TYPE_DEBUG); - string cmd = installDir + "/bin/performance_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + calpontPackage + " " + calpontPackage1 + " " + calpontPackage2 + " " + mysqlPackage + " " + mysqldPackage + " initial " + packageType + " --nodeps 1 > /tmp/performance_installer.log"; + string cmd = installDir + "/bin/performance_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + version + " initial " + packageType + + " --nodeps 1 > /tmp/performance_installer.log"; log.writeLog(__LINE__, "addModule cmd: " + cmd, LOG_TYPE_DEBUG); rtnCode = system(cmd.c_str());