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

change to run in HVM instance

Browse Source
This commit is contained in:
david hill
2016-04-26 16:40:44 -05:00
parent 81a99756eb
commit fd7933c61a
5 changed files with 76 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
oamapps/postConfigure/postConfigure.cpp
View File

@@ -668,7 +668,14 @@ int main(int argc, char *argv[])
}
catch(...)
{}
}
if ( amazonSubNet == oam::UnassignedName || amazonSubNet == "" )
{
amazonSubNet = oam.getEC2LocalInstanceSubnet();
if ( amazonSubNet == "failed" || amazonSubNet == "" )
amazonSubNet == oam::UnassignedName;
}
}
}
}
@@ -964,13 +971,16 @@ int main(int argc, char *argv[])
amazonVPC = true;
cloud = "amazon-vpc";
prompt = "Enter VPC SubNet ID (" + amazonSubNet + ") > ";
pcommand = callReadline(prompt.c_str());
if (pcommand) {
if (strlen(pcommand) > 0) amazonSubNet = pcommand;
callFree(pcommand);
if ( amazonSubNet == oam::UnassignedName )
{
prompt = "Enter VPC SubNet ID (" + amazonSubNet + ") > ";
pcommand = callReadline(prompt.c_str());
if (pcommand) {
if (strlen(pcommand) > 0) amazonSubNet = pcommand;
callFree(pcommand);
}
}
//set subnetID
try {
sysConfig->setConfig(InstallSection, "AmazonSubNetID", amazonSubNet);
@@ -3521,7 +3531,7 @@ int main(int argc, char *argv[])
cout << ". " + installDir + "/bin/calpontAlias" << endl << endl;
cout << "Enter 'idbmysql' to access the InfiniDB MySQL console" << endl;
cout << "Enter 'cc' to access the InfiniDB OAM console" << endl << endl;
cout << "Enter 'cc' to access the InfiniDB System Management console" << endl << endl;
}
else
{