removed use of columnstore.xml.singleserver

oam/etc/Columnstore.xml

@@ -445,7 +445,6 @@
 		<UMStorageType>internal</UMStorageType>
 		<EEPackageType>rpm</EEPackageType>
 		<SystemLogConfigFile>unassigned</SystemLogConfigFile>
-		<rpw>mariadb1</rpw>
 		<Cloud>unassigned</Cloud>
 		<AmazonVPCNextPrivateIP>autoassign</AmazonVPCNextPrivateIP>
 		<UMInstanceType>unassigned</UMInstanceType>

oamapps/postConfigure/postConfigure.cpp

@@ -719,21 +719,69 @@ int main(int argc, char* argv[])
 
                 if ( reuseConfig == "n" )
                 {
-                    //setup to use the single server Columnstore.xml file
+                    //setup to Columnstore.xml file for single server
 
-                    // we know that our Config instance just timestamped itself in the getConfig
+		    try
-                    // call above.  if postConfigure is running non-interactively we may get here
+		    {
-                    // within the same second which means the changes that are about to happen
+			sysConfig->setConfig("ExeMgr1", "IPAddr", "127.0.0.1");
-                    // when Columnstore.xml gets overwritten will be ignored because of the Config
+			sysConfig->setConfig("ExeMgr1", "Module", "pm1");
-                    // instance won't know to reload
+			sysConfig->setConfig("ProcMgr", "IPAddr", "127.0.0.1");
-                    sleep(2);
+			sysConfig->setConfig("ProcMgr_Alarm", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("ProcStatusControl", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("pm1_ProcessMonitor", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("pm1_ServerMonitor", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("pm1_WriteEngineServer", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("DDLProc", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("DMLProc", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS1", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS2", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS3", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS4", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS5", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS6", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS7", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS8", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS9", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS10", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS11", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS12", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS13", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS14", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS15", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS16", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS17", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS18", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS19", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS20", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS21", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS22", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS23", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS24", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS25", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS26", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS27", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS28", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS29", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS30", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS31", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("PMS32", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("SystemModuleConfig", "ModuleCount2", "0");
+			sysConfig->setConfig("SystemModuleConfig", "ModuleIPAddr1-1-3", "127.0.0.1");
+			sysConfig->setConfig("SystemModuleConfig", "ModuleHostName1-1-3", "localhost");
+			sysConfig->setConfig("DBRM_Controller", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("DBRM_Worker1", "IPAddr", "127.0.0.1");
+			sysConfig->setConfig("DBRM_Worker1", "Module", "pm1");
+			sysConfig->setConfig("DBBC", "NumBlocksPct", "50");
+			sysConfig->setConfig("Installation", "InitialInstallFlag", "y");
+			sysConfig->setConfig("Installation", "SingleServerInstall", "y");
+			sysConfig->setConfig("HashJoin", "TotalUmMemory", "25%");
+		    }
 
-                    cmd = "rm -f " + installDir + "/etc/Columnstore.xml.installSave  > /dev/null 2>&1";
+		    catch (...)
-                    system(cmd.c_str());
+		    {
-                    cmd = "mv -f " + installDir + "/etc/Columnstore.xml " + installDir + "/etc/Columnstore.xml.installSave  > /dev/null 2>&1";
+			cout << "ERROR: Problem setting for Single Server in the MariaDB ColumnStore System Configuration file" << endl;
-                    system(cmd.c_str());
+			exit(1);
-                    cmd = "/bin/cp -f " + installDir + "/etc/Columnstore.xml.singleserver " + installDir + "/etc/Columnstore.xml  > /dev/null 2>&1";
+		    }
-                    system(cmd.c_str());
 		}
 
                 setSystemName();
@@ -3919,19 +3967,7 @@ bool checkSaveConfigFile()
         string cmd;
 
         if ( reuseConfig == "y" )
-        {
-            if ( singleServerInstall == "1")
-            {
-                cmd = "rm -f " + installDir + "/etc/Columnstore.xml.installSave  > /dev/null 2>&1";
-                system(cmd.c_str());
-                cmd = "mv -f " + installDir + "/etc/Columnstore.xml " + installDir + "/etc/Columnstore.xml.installSave  > /dev/null 2>&1";
-                system(cmd.c_str());
-                cmd = "/bin/cp -f " + installDir + "/etc/Columnstore.xml.singleserver " + installDir + "/etc/Columnstore.xml  > /dev/null 2>&1";
-                system(cmd.c_str());
-            }
-
             break;
-        }
 
         if ( reuseConfig == "n" )
         {

procmgr/main.cpp

@@ -2263,18 +2263,7 @@ void pingDeviceThread()
                                             }
 
                                             // add module
-                                            string password = oam::UnassignedName;
+					    ret = processManager.addModule(devicenetworklist, "ssh", false);
-
-                                            try
-                                            {
-                                                oam.getSystemConfig("rpw", password);
-                                            }
-                                            catch (...)
-                                            {
-                                                password = oam::UnassignedName;
-                                            }
-
-                                            ret = processManager.addModule(devicenetworklist, password, false);
 
                                             if ( ret != oam::API_SUCCESS )
                                             {

procmgr/processmanager.cpp

@@ -4967,24 +4967,6 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
         // Verify Host IP and Password
         //
 
-        if ( password == "ssh" && amazon )
-        {
-            // check if there is a root password stored
-            string rpw = oam::UnassignedName;
-
-            try
-            {
-                oam.getSystemConfig("rpw", rpw);
-            }
-            catch (...)
-            {
-                rpw = "mariadb1";
-            }
-
-            if (rpw != oam::UnassignedName)
-                password = rpw;
-        }
-
         listPT = devicenetworklist.begin();
 
         for ( ; listPT != devicenetworklist.end() ; listPT++)