diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp index 7ef10b1cb..828c9df9d 100644 --- a/oam/oamcpp/liboamcpp.cpp +++ b/oam/oamcpp/liboamcpp.cpp @@ -5964,6 +5964,9 @@ namespace oam catch(...) {} writeLog("addUMdisk - Create new Volume for um" + itoa(moduleID), LOG_TYPE_DEBUG); + + cout << " Create AWS Volume for UM #" << itoa(moduleID) << endl; + volumeName = createEC2Volume(UMVolumeSize, "um"); if ( volumeName == "failed" ) { writeLog("addModule: create volume failed", LOG_TYPE_CRITICAL); @@ -5984,6 +5987,7 @@ namespace oam //format attached volume writeLog("addUMdisk - Format new Volume for: " + volumeName, LOG_TYPE_DEBUG); + cout << " Formatting disk for UM #" << itoa(moduleID) << ", please wait..." << endl; string cmd; int user; diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp index a3c02bd9d..ee918cc3c 100644 --- a/oamapps/postConfigure/postConfigure.cpp +++ b/oamapps/postConfigure/postConfigure.cpp @@ -2103,7 +2103,6 @@ int main(int argc, char *argv[]) { //create new UM volume try{ - oam.addUMdisk(moduleID, volumeName, deviceName, UMVolumeSize); } catch(...) { @@ -4242,9 +4241,9 @@ bool storageSetup(bool amazonInstall) else { - cout << "NOTE: The volume type. This can be gp2 for General Purpose SSD, io1 for" << endl; + cout << endl << "NOTE: The volume type. This can be gp2 for General Purpose SSD, io1 for" << endl; cout << " Provisioned IOPS SSD, st1 for Throughput Optimized HDD, sc1 for Cold" << endl; - cout << " HDD, or standard for Magnetic volumes." << endl << endl; + cout << " HDD, or standard for Magnetic volumes." << endl; UMStorageType = "external"; @@ -4256,11 +4255,11 @@ bool storageSetup(bool amazonInstall) {} if ( UMVolumeType.empty() || UMVolumeType == "") - UMVolumeType = "standard"; + UMVolumeType = "gp2"; while(true) { - string prompt = "Enter EBS Volume Type (standard, gp2, io1, sc1, st1) : (" + UMVolumeType + ") > "; + string prompt = "Enter EBS Volume Type (gp2, io1, sc1, st1, standard) : (" + UMVolumeType + ") > "; pcommand = callReadline(prompt); if (pcommand) { @@ -4587,9 +4586,9 @@ bool storageSetup(bool amazonInstall) // if external and amazon, prompt for storage size if ( storageType == "2" && amazonInstall) { - cout << "NOTE: The volume type. This can be gp2 for General Purpose SSD, io1 for" << endl; + cout << endl << "NOTE: The volume type. This can be gp2 for General Purpose SSD, io1 for" << endl; cout << " Provisioned IOPS SSD, st1 for Throughput Optimized HDD, sc1 for Cold" << endl; - cout << " HDD, or standard for Magnetic volumes." << endl << endl; + cout << " HDD, or standard for Magnetic volumes." << endl; cout << endl; try { @@ -4599,11 +4598,11 @@ bool storageSetup(bool amazonInstall) {} if ( PMVolumeType.empty() || PMVolumeType == "") - PMVolumeType = "standard"; + PMVolumeType = "gp2"; while(true) { - string prompt = "Enter EBS Volume Type (standard, gp2, io1, sc1, st1) : (" + PMVolumeType + ") > "; + string prompt = "Enter EBS Volume Type (gp2, io1, sc1, st1, standard) : (" + PMVolumeType + ") > "; pcommand = callReadline(prompt); if (pcommand) {