From 2a8b29274f65aa6ca100f74e480adb665da20f05 Mon Sep 17 00:00:00 2001
From: David Hill <david.hill@mariadb.com>
Date: Wed, 4 Jan 2017 09:13:38 -0600
Subject: [PATCH] MCOL-462

---
 oam/cloud/MCSVolumeCmds.sh              |  2 +-
 oamapps/postConfigure/postConfigure.cpp | 29 +++++++++++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/oam/cloud/MCSVolumeCmds.sh b/oam/cloud/MCSVolumeCmds.sh
index d9e1be800..b4bcb0b19 100755
--- a/oam/cloud/MCSVolumeCmds.sh
+++ b/oam/cloud/MCSVolumeCmds.sh
@@ -168,7 +168,7 @@ createvolume() {
 
 	#create volume
 	if [ $volumeType == "io1" ]; then
-		volume=`$AWSCLI create-volume   --availability-zone $zone --size $volumeSize --volume-type $volumeType -iops $volumeIOPS --output text --query VolumeId`
+		volume=`$AWSCLI create-volume   --availability-zone $zone --size $volumeSize --volume-type $volumeType --iops $volumeIOPS --output text --query VolumeId`
 	else
 		volume=`$AWSCLI create-volume   --availability-zone $zone --size $volumeSize --volume-type $volumeType --output text --query VolumeId`
 	fi
diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp
index c56241421..a3c02bd9d 100644
--- a/oamapps/postConfigure/postConfigure.cpp
+++ b/oamapps/postConfigure/postConfigure.cpp
@@ -4241,6 +4241,11 @@ bool storageSetup(bool amazonInstall)
 			UMStorageType = "internal";
 		else
 		{
+			
+			cout << "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;
+
 			UMStorageType = "external";
 
 			cout << endl;
@@ -4255,7 +4260,7 @@ bool storageSetup(bool amazonInstall)
 
 			while(true)
 			{
-				string prompt = "Enter EBS Volume Type (standard, gp2, io1) : (" + UMVolumeType + ") > ";
+				string prompt = "Enter EBS Volume Type (standard, gp2, io1, sc1, st1) : (" + UMVolumeType + ") > ";
 				pcommand = callReadline(prompt);
 				if (pcommand)
 				{
@@ -4263,7 +4268,7 @@ bool storageSetup(bool amazonInstall)
 					callFree(pcommand);
 				}
 
-				if ( UMVolumeType == "standard" || UMVolumeType == "gp2" || UMVolumeType == "io1" )
+				if ( UMVolumeType == "standard" || UMVolumeType == "gp2" || UMVolumeType == "io1" || UMVolumeType == "sc1" || UMVolumeType == "st1")
 					break;
 				else
 				{
@@ -4289,6 +4294,12 @@ bool storageSetup(bool amazonInstall)
 			if (UMVolumeType == "io1")
 				minSize = "4";
 
+            if (UMVolumeType == "sc1" || UMVolumeType == "st1")
+                minSize = "500";
+
+            if (UMVolumeType == "standard")
+                maxSize = "1024";
+
 			cout << endl;
 			try {
 				oam.getSystemConfig("UMVolumeSize", UMVolumeSize);
@@ -4576,6 +4587,10 @@ 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 << "      Provisioned IOPS SSD, st1 for Throughput Optimized HDD, sc1 for Cold" << endl;
+      	cout << "      HDD, or standard for Magnetic volumes." << endl << endl;
+
 		cout << endl;
 		try {
 			oam.getSystemConfig("PMVolumeType", PMVolumeType);
@@ -4588,7 +4603,7 @@ bool storageSetup(bool amazonInstall)
 
 		while(true)
 		{
-			string prompt = "Enter EBS Volume Type (standard, gp2, io1) : (" + PMVolumeType + ") > ";
+			string prompt = "Enter EBS Volume Type (standard, gp2, io1, sc1, st1) : (" + PMVolumeType + ") > ";
 			pcommand = callReadline(prompt);
 			if (pcommand)
 			{
@@ -4596,7 +4611,7 @@ bool storageSetup(bool amazonInstall)
 				callFree(pcommand);
 			}
 
-			if ( PMVolumeType == "standard" || PMVolumeType == "gp2" || PMVolumeType == "io1" )
+			if ( PMVolumeType == "standard" || PMVolumeType == "gp2" || PMVolumeType == "io1" || PMVolumeType == "gp2" || PMVolumeType == "io1")
 				break;
 			else
 			{
@@ -4632,6 +4647,12 @@ bool storageSetup(bool amazonInstall)
 		if (PMVolumeType == "io1")
 			minSize = "4";
 
+       	if (PMVolumeType == "sc1" || PMVolumeType == "st1")
+        	minSize = "500";
+
+      	if (PMVolumeType == "standard")
+          	maxSize = "1024";
+
 		while(true)
 		{
 			string prompt = "Enter EBS Volume storage size in GB: [" + minSize + "," + maxSize + "] (" + PMVolumeSize + ") > ";