database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-11-03 17:13:17 +03:00
Code Activity

Add managePackages as parameter for user_installer.sh calls

Browse Source
This commit is contained in:
Jean Baptiste Favre
2017-02-15 15:57:08 +01:00
parent 5d98b8647a
commit 617bb618cc
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
oamapps/postConfigure/installer.cpp
View File

@@ -99,6 +99,7 @@ int main(int argc, char *argv[])
string nodeps = "-h"; string nodeps = "-h";
string installer_debug = "0"; string installer_debug = "0";
string packageType = "rpm"; string packageType = "rpm";
string managePackages = "1";
Config* sysConfig = Config::makeConfig(); Config* sysConfig = Config::makeConfig();
string SystemSection = "SystemConfig"; string SystemSection = "SystemConfig";
@@ -383,6 +384,16 @@ int main(int argc, char *argv[])
exit(1); exit(1);
} }
//Have we to manage packages ?
try{
managePackages = sysConfig->getConfig(InstallSection, "managePackages");
}
catch(...)
{
cout << "ERROR: Problem getting managePackages" << endl;
exit(1);
}
//get Parent OAM Module Name and setup of it's Custom OS files //get Parent OAM Module Name and setup of it's Custom OS files
string parentOAMModuleName; string parentOAMModuleName;
try{ try{
@@ -555,7 +566,7 @@ int main(int argc, char *argv[])
temppwprompt = "none"; temppwprompt = "none";
cout << endl << "----- Performing Uninstall on Module '" + remoteModuleName + "' -----" << endl << endl; cout << endl << "----- Performing Uninstall on Module '" + remoteModuleName + "' -----" << endl << endl;
cmd = installDir + "/bin/user_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + calpont_rpm1 + " " + calpont_rpm2 + " " + calpont_rpm3 + " " + mysql_rpm + " " + mysqld_rpm + " " + installType + " " + packageType + " " + nodeps + " " + temppwprompt + " " + installer_debug; cmd = installDir + "/bin/user_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + calpont_rpm1 + " " + calpont_rpm2 + " " + calpont_rpm3 + " " + mysql_rpm + " " + mysqld_rpm + " " + installType + " " + packageType + " " + nodeps + " " + temppwprompt + " " + installer_debug + " " + managePackages;
int rtnCode = system(cmd.c_str()); int rtnCode = system(cmd.c_str());
if (WEXITSTATUS(rtnCode) != 0) { if (WEXITSTATUS(rtnCode) != 0) {
cout << endl << "ERROR: returned from user_installer.sh" << endl; cout << endl << "ERROR: returned from user_installer.sh" << endl;
@@ -649,7 +660,7 @@ int main(int argc, char *argv[])
temppwprompt = "none"; temppwprompt = "none";
cout << endl << "----- Performing Install on Module '" + remoteModuleName + "' -----" << endl << endl; cout << endl << "----- Performing Install on Module '" + remoteModuleName + "' -----" << endl << endl;
cmd = installDir + "/bin/user_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + calpont_rpm1 + " " + calpont_rpm2 + " " + calpont_rpm3 + " " + mysql_rpm + " " + mysqld_rpm + " " + installType + " " + packageType + " " + nodeps + " " + temppwprompt + " " + installer_debug; cmd = installDir + "/bin/user_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + calpont_rpm1 + " " + calpont_rpm2 + " " + calpont_rpm3 + " " + mysql_rpm + " " + mysqld_rpm + " " + installType + " " + packageType + " " + nodeps + " " + temppwprompt + " " + installer_debug + managePackages;
int rtnCode = system(cmd.c_str()); int rtnCode = system(cmd.c_str());
if (WEXITSTATUS(rtnCode) != 0) { if (WEXITSTATUS(rtnCode) != 0) {
cout << endl << "ERROR returned from user_installer.sh" << endl; cout << endl << "ERROR returned from user_installer.sh" << endl;

4
procmgr/processmanager.cpp
View File

@@ -4484,8 +4484,10 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
string systemID; string systemID;
string packageType = "rpm"; string packageType = "rpm";
string managePackages = "1";
oam.getSystemConfig("EEPackageType", packageType); oam.getSystemConfig("EEPackageType", packageType);
oam.getSystemConfig("managePackages", managePackages);
// //
// check for RPM package // check for RPM package
@@ -5063,7 +5065,7 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
if ( packageType != "binary" ) { if ( packageType != "binary" ) {
log.writeLog(__LINE__, "addModule - user_installer run for " + remoteModuleName, LOG_TYPE_DEBUG); log.writeLog(__LINE__, "addModule - user_installer run for " + remoteModuleName, LOG_TYPE_DEBUG);
string cmd = installDir + "/bin/user_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + version + " 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 " + managePackages + " > /tmp/user_installer.log";
log.writeLog(__LINE__, "addModule cmd: " + cmd, LOG_TYPE_DEBUG); log.writeLog(__LINE__, "addModule cmd: " + cmd, LOG_TYPE_DEBUG);