Merge pull request #78 from ravigurram8/topic-release-3

products default instance type changes to t3 family ,Readme file updated

Author: RLIndia

README.md

@@ -55,9 +55,9 @@ Deploying an Application Load Balancer as part of Research Gateway deployment he
 1. Isolates your portal from being directly exposed over the internet. The ALB allows only https(s) traffic through.
 2. Helps to serve the application on a secure port using SSL certificates stored in AWS ACM.
 
-create an ALB security Group with the following inbound and outbound rules
- Inbound Rules - HTTP 80 ,HTTPS-443,SSH-20 .
- outbound Rules - All Traffic.
+create an ALB security Group with the following inbound and outbound rules.
+ - Inbound rules - HTTP 80 ,HTTPS 443,SSH 22 .
+ - outbound Rules - All Traffic.
 
 Use the AWS CLI to create an Application Load Balancer choosing all three public subnets created by the quickstart above.
 
@@ -161,12 +161,12 @@ You can create the AMI with pre-requisites yourself by following these steps:
 Clone this repo on a machine that has AWS CLI configured with Default output format as JSON.
 Run deploy.sh with the following parameters.
 
-- Check aws configure before running script
-  aws configure
-  AWS Access Key ID: <access Key ID>
-  AWS Secret Access Key :<secret Key>
-  Default region name: <region-name>
-  Default output format : json
+ *Note* : Check aws configure before running script
+  - $aws configure
+      - AWS Access Key ID:"your_Access_Key"
+      - AWS Secret Access Key :"your_Secret_Key"
+      - Default region name:"Your_Region"
+      - Default output format : json
 
 
 | Parameter# | Purpose                                                                                    |
@@ -192,6 +192,8 @@ runid.json is created in the rgdeploy folder when you first run deploy.sh with p
 
 The deployment creates EC2 Image Builder pipelines for building the RStudio and Nextflow AMIs that are used within Research Gateway. By default, these pipelines are set up to be manually triggered. You can change that in the AWS console if you wish to  trigger them on a schedule.
 
+steps to run pipelines: AWS console - Ec2imagebuilder – select image pipelines (Rstudio, Nextflow)-click on Actions-Run pipeline
+
 Once a build is completed, the AMIs are automatically distributed to the regions supported by Research Gateway in your account. The AMI Ids need to be updated into your database before creating any projects. 
 
 - Note down the names of the two pipelines created for RStudio and Nextflow_Advanced. They will be of the format:
@@ -201,6 +203,8 @@ The runid will be the random 4-character string generated for your instance duri
 - In the rgdeploy folder, cd to products folder. You will find an img-builder-config.json file there. Edit it and set the pipeline names according to the ones deployed in your account. Save the file.
 - Run the script make-amilist.sh. You may have to run chmod +x make-amilist.sh if execute permissions are not set on the file.
 
+- Note: we need to wait untill ec2image builder pipeline distribution complete,without builds complete by running below command shows Error
+
       ./make-amilist.sh > new-ami-list.json
 - Next run the following command to update your DB.
 

cft-templates/Rstudio.yml

@@ -19,15 +19,15 @@ Parameters:
       the environment instance, including any bootstrap scripts
   InstanceType:
     Type: String
-    Description: Instance type for RStudio. Default is t2.medium.
+    Description: Instance type for RStudio. Default is t3.medium.
     AllowedValues:
       - t2.medium
       - t2.large
       - t3.medium
       - t3.large
 
-    ConstraintDescription: Valid instance type in the t2 families
-    Default: t2.medium
+    ConstraintDescription: Valid instance type in the t3 families
+    Default: t3.medium
   InitialUser:
     Type: String
     Description: User Name for RStudio. Do not use 'root' and 'ec2-user'

cft-templates/cromwell-advanced.yaml

@@ -82,8 +82,8 @@ Parameters:
   InstanceType:
     Description: Head Node EC2 instance type
     Type: String
-    Default: t2.small
-    AllowedValues: [t2.nano, t2.micro, t2.small, t2.medium]
+    Default: t3.small
+    AllowedValues: [t3.nano, t3.micro, t3.small, t3.medium]
     ConstraintDescription: Must be a valid EC2 instance type.
   WorkerNodeInstanceType:
     Description: Specify the instance types to be used to carry out the computation. You can specify one or more family or instance type. The option 'optimal' chooses the best fit of M4, C4, and R4 instance types available in the region.

cft-templates/ec2-EIP.yml

@@ -21,10 +21,10 @@ Parameters:
       An S3 URI (starting with "s3://") that specifies the location of files to be copied to
       the environment instance, including any bootstrap scripts
   InstanceType:
-    Description: Choose the instance type for this instance. e.g. t2.small
+    Description: Choose the instance type for this instance. e.g. t3.small
     Type: String
-    Default: t2.small
-    AllowedValues: [t2.nano, t2.micro, t2.small, t2.medium]
+    Default: t3.small
+    AllowedValues: [t3.nano, t3.micro, t3.small, t3.medium]
     ConstraintDescription: must be a valid EC2 instance type.
   KeyPair:
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instance. If no key pairs exist, please create one from the button next to the dropdown. Please contact your Administrator if you are unable to create one.

cft-templates/ec2-linux-docker-mysql.yml

@@ -21,10 +21,10 @@ Parameters:
       An S3 URI (starting with "s3://") that specifies the location of files to be copied to
       the environment instance, including any bootstrap scripts
   InstanceType:
-    Description: Choose the instance type for this instance. e.g. t2.small
+    Description: Choose the instance type for this instance. e.g. t3.small
     Type: String
-    Default: t2.small
-    AllowedValues: [t2.nano, t2.micro, t2.small, t2.medium]
+    Default: t3.small
+    AllowedValues: [t3.nano, t3.micro, t3.small, t3.medium]
     ConstraintDescription: must be a valid EC2 instance type.
   KeyPair:
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instance. If no key pairs exist, please create one from the button next to the dropdown. Please contact your Administrator if you are unable to create one.

cft-templates/ec2-linux-docker.yml

@@ -21,10 +21,10 @@ Parameters:
       An S3 URI (starting with "s3://") that specifies the location of files to be copied to
       the environment instance, including any bootstrap scripts
   InstanceType:
-    Description: Choose the instance type for this instance. e.g. t2.small
+    Description: Choose the instance type for this instance. e.g. t3.small
     Type: String
-    Default: t2.small
-    AllowedValues: [t2.nano, t2.micro, t2.small, t2.medium]
+    Default: t3.small
+    AllowedValues: [t3.nano, t3.micro, t3.small, t3.medium]
     ConstraintDescription: must be a valid EC2 instance type.
   KeyPair:
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instance. If no key pairs exist, please create one from the button next to the dropdown. Please contact your Administrator if you are unable to create one.

cft-templates/ec2-ubuntu.yml

@@ -21,10 +21,10 @@ Parameters:
       An S3 URI (starting with "s3://") that specifies the location of files to be copied to
       the environment instance, including any bootstrap scripts
   InstanceType:
-    Description: Choose the instance type for this instance. e.g. t2.small
+    Description: Choose the instance type for this instance. e.g. t3.small
     Type: String
-    Default: t2.small
-    AllowedValues: [t2.nano, t2.micro, t2.small, t2.medium]
+    Default: t3.small
+    AllowedValues: [t3.nano, t3.micro, t3.small, t3.medium]
     ConstraintDescription: must be a valid EC2 instance type.
   KeyPair:
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instance. If no key pairs exist, please create one from the button next to the dropdown. Please contact your Administrator if you are unable to create one.

cft-templates/nextflow-advanced.yaml

@@ -87,8 +87,8 @@ Parameters:
   InstanceType:
     Description: Head Node EC2 instance type
     Type: String
-    Default: t2.small
-    AllowedValues: [t2.nano, t2.micro, t2.small, t2.medium]
+    Default: t3.small
+    AllowedValues: [t3.nano, t3.micro, t3.small, t3.medium]
     ConstraintDescription: Must be a valid EC2 instance type.
   KeyPair:
     Description: Name of an existing EC2 KeyPair to enable SSH access to the Head Node. If no key pairs exist, please create one from the button next to the dropdown. Please contact your Administrator if you are unable to create one.

cft-templates/sagemaker-template-with-url.yml

@@ -10,8 +10,8 @@ Parameters:
       - ml.t2.medium
       - ml.t3.medium
     ConstraintDescription: Must select a valid notebook instance type.
-    Default: ml.t2.medium
-    Description: Select Instance type for the SageMaker Notebook. e.g.ml.t2.medium
+    Default: ml.t3.medium
+    Description: Select Instance type for the SageMaker Notebook. e.g.ml.t3.medium
     Type: String
 Resources:
   SageMakerRole: 

cft-templates/windows-ec2.yaml

@@ -10,10 +10,10 @@ Description: 'AWS CloudFormation Sample Template Sample template EIP_With_Associ
   You will be billed for the AWS resources used if you create a stack from this template.'
 Parameters:
   InstanceType:
-    Description: Choose the instance type for this instance. e.g. t2.small
+    Description: Choose the instance type for this instance. e.g. t3.small
     Type: String
-    Default: t2.small
-    AllowedValues: [t2.nano, t2.micro, t2.small, t2.medium]
+    Default: t3.small
+    AllowedValues: [t3.nano, t3.micro, t3.small, t3.medium]
     ConstraintDescription: must be a valid EC2 instance type.
   KeyPair:
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instance. If no key pairs exist, please create one from the button next to the dropdown. Please contact your Administrator if you are unable to create one.