Merge pull request #19 from ctienshi/master

Allow users to select EC2 instance type

APIM-with-Analytics/APIM-with-Analytics.yaml

@@ -24,6 +24,7 @@ Metadata:
           - AWSAccessKeyId
           - AWSAccessKeySecret
           - KeyPairName
+          - WSO2InstanceType
       - Label:
           default: Network Configurations
         Parameters:
@@ -341,7 +342,7 @@ Resources:
         - WSO2PuppetMasterRegionMap
         - !Ref 'AWS::Region'
         - Ubuntu140464bit
-      InstanceType: t2.medium
+      InstanceType: !Ref WSO2InstanceType
       KeyName: !Ref KeyPairName
       Monitoring: 'false'
       Tags:
@@ -359,7 +360,6 @@ Resources:
           - |+
 
           - - '#!/bin/bash'
-            - set -e
             - 'export PATH=~/.local/bin:$PATH'
             - echo "> Set hostname to puppetmaster"
             - hostname puppetmaster
@@ -447,7 +447,7 @@ Resources:
         - WSO2APIMAMIRegionMap
         - !Ref 'AWS::Region'
         - Ubuntu140464bit
-      InstanceType: t2.medium
+      InstanceType: !Ref WSO2InstanceType
       BlockDeviceMappings:
         - DeviceName: /dev/sda1
           Ebs:
@@ -462,7 +462,6 @@ Resources:
           - |+
 
           - - '#!/bin/bash'
-            - set -e
             - 'export PATH=~/.local/bin:$PATH'
             - apt-get update
             - apt-get install -y nfs-common
@@ -588,7 +587,7 @@ Resources:
         - WSO2APIMAMIRegionMap
         - !Ref 'AWS::Region'
         - Ubuntu140464bit
-      InstanceType: t2.medium
+      InstanceType: !Ref WSO2InstanceType
       BlockDeviceMappings:
         - DeviceName: /dev/sda1
           Ebs:
@@ -603,7 +602,6 @@ Resources:
           - |+
 
           - - '#!/bin/bash'
-            - set -e
             - 'export PATH=~/.local/bin:$PATH'
             - apt-get update
             - apt-get install -y nfs-common
@@ -759,7 +757,7 @@ Resources:
         - WSO2APIMAnalyticsAMIRegionMap
         - !Ref 'AWS::Region'
         - Ubuntu140464bit
-      InstanceType: t2.medium
+      InstanceType: !Ref WSO2InstanceType
       BlockDeviceMappings:
         - DeviceName: /dev/sda1
           Ebs:
@@ -774,7 +772,6 @@ Resources:
           - |+
 
           - - '#!/bin/bash'
-            - set -e
             - 'export PATH=~/.local/bin:$PATH'
             - apt-get update
             - sed -i '/\[main\]/a server=puppet' /etc/puppet/puppet.conf
@@ -1125,6 +1122,25 @@ Parameters:
     Description: A previously uploaded certificate to use at the Load Balancer Listeners.
     Type: String
     MinLength: 1
+  WSO2InstanceType:
+    Description: EC2 instance type of the WSO2 nodes
+    Type: String
+    Default: t2.medium
+    AllowedValues:
+      - t2.nano
+      - t1.micro
+      - t2.micro
+      - t2.small
+      - t2.medium
+      - t2.large
+      - t2.xlarge
+      - t2.2xlarge
+      - m3.medium
+      - m3.large
+      - m3.xlarge
+      - m3.2xlarge
+      - m4.large
+    ConstraintDescription: Must be a valid EC2 instance type
   JDK:
     Type: String
     Default: "jdk-8u144-linux-x64.tar.gz"

README.md

@@ -9,17 +9,15 @@ This repository contains CloudFormation templates to deploy WSO2 API Manager wit
 git clone https://github.com/wso2/aws-apim.git
 ```
 
-2. Go to [AWS console](https://console.aws.amazon.com/ec2/v2/home#KeyPairs:sort=keyName) and specify a key value pair for authentication in **us-east-1** region. This could be used to ssh into the instances.
+2. Go to [AWS console](https://console.aws.amazon.com/ec2/v2/home#KeyPairs:sort=keyName) and specify a key value pair for authentication in **us-east-1** region. This could be used to ssh into the instances. Add a Server Certificate to AWS using ACM or IAM as explained [here](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html). This will be used at the load balancer listeners.
 
-3. Add a Server Certificate to AWS using ACM or IAM as explained [here](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html). This will be used at the load balancer listeners.
+3. Go to [AWS CloudFormation console](https://console.aws.amazon.com/cloudformation/home) and select ``Launch Cloudformer``.
 
-4. Go to [AWS CloudFormation console](https://console.aws.amazon.com/cloudformation/home) and select ``Launch Cloudformer``.
-
-5. Browse to the cloned repository and select the Cloudformation template for the preferred deployment pattern and proceed with the deployment.
+4. Browse to the cloned repository and select the Cloudformation template for the preferred deployment pattern and proceed with the deployment.
     <br> Available patterns are [APIM-with-Analytics](https://github.com/wso2/aws-apim/tree/master/APIM-with-Analytics).
-6. Follow the on screen instructions and provide the SSH key value pair name given in step 2, Server-Certificate-Name given in step 3 and other requested information and proceed.
+5. Follow the on screen instructions and provide the SSH key value pair name given in step 2, Server-Certificate-Name given in step 3 and other requested information and proceed.
 
-7. Access the web UIs via the URLs available in the **Outputs** tab and login using the following credentials.
+6. Access the web UIs via the URLs available in the **Outputs** tab and login using the following credentials.
    * Username: admin <br>
    * Password: admin