Govcloud

README.md

@@ -1,12 +1,10 @@
 # MultiCloud Bootstrap Process
 
 This folder contains the automation required for the bootstrap process.
-The scripts in this folder are not meant to be called manually unless needed for troubleshooting. These scripts are called in a specific order during the bootstrap process. The bootstrap process is called from the virtual server (aka the `bootnode`) automatically when the bootnode is created. The bootnode is a virtual server (_EC2 instance_ in AWS and _virtual machine_ in Azure and Google Cloud) that gets created in the buyer's account during the MAS instance deployment.
+The scripts in this folder are not meant to be called manually unless needed for troubleshooting. These scripts are called in a specific order during the bootstrap process. The bootstrap process is called from the virtual server (aka the `bootnode`) automatically when the bootnode is created. The bootnode is a virtual server (_EC2 instance_ in AWS ) that gets created in the buyer's account during the MAS instance deployment.
 
 For example,
 - In AWS, the Marketplace product has associated CloudFormation template, and the template creates the EC2 instance. The _UserData_ section in the EC2 instance has the commands to start the bootstrap process.
-- In Azure, the Marketplace product has associated ARM template, and the template creates the virtual machine. The virtual machine has the _CustomScript extension_ defined that has the commands to start the bootstrap process.
-
 Below are the steps that are invoked by Cloud provider automatically upon the creation of the bootnode.
 
 #### From the template associated with the Marketplace product

aws/aws-product-codes.config

@@ -4,6 +4,8 @@
 9i61mljzpi48oygb8h47a0k0j:a08b925c-d629-4fa4-ba5f-c7785e0dab53:byol:IBM Maximo Application Suite (BYOL)
 # Production Listing: BYOL
 vrxqov1ml7fjwasbi7pkw4m3:0ee8c8fc-c4c4-4b23-880d-af752566675b:byol:IBM Maximo Application Suite (BYOL)
+# Production Listing: BYOL (US GovCloud)
+evjx4g1fikql160za77spyqv3:fb4819e7-048b-4060-8d8f-e9bfa2c6957f:byol:IBM Maximo Application Suite (BYOL) (US GovCloud)
 # Production Listing: PAID Existing cluster Only - No New cluster creation option in cft
 548es26yxydoawlwpghgoxcxn:567142b7-480a-4728-bb06-ca34e1e627bb:privatepublic:IBM Maximo Application Suite (Paid, without Red Hat OpenShift license)
 # Production Listing: PAID Always create new cluster(IPI + UPI) - No existing cluster option in cft

aws/bootnode-ami/prepare-bootnode-ami.sh

@@ -71,17 +71,6 @@ wget https://s3.amazonaws.com/amazoncloudwatch-agent/redhat/amd64/latest/amazon-
 rpm -U ./amazon-cloudwatch-agent.rpm
 rm -rf amazon-cloudwatch-agent.rpm
 
-
-
-
-#Installig cpd-cli for db2wh
-wget https://github.com/IBM/cpd-cli/releases/download/v12.0.3/cpd-cli-linux-SE-12.0.3.tgz
-tar -zvxf cpd-cli-linux-SE-12.0.3.tgz
-rm -rf cpd-cli-linux-SE-12.0.3.tgz
-cd cpd-cli-linux-SE-12.0.3-43
-chmod +x cpd-cli
-mv * /usr/local/bin/
-
 # Remove the SSH keys
 rm -rf /home/ec2-user/.ssh/authorized_keys /root/.ssh/authorized_keys
 echo "Bootnode preparation completed"

aws/cleanup-mas-deployment.sh

@@ -75,7 +75,7 @@ if [[ -z $REGION ]]; then
   echo "ERROR: Parameter 'region-code' not provided"
   usage
 fi
-SUPPORTED_REGIONS="us-east-1;us-east-2;us-west-2;ap-east-1;ap-southeast-1;ap-southeast-2;ap-northeast-1;eu-central-1;ap-south-1;ap-northeast-2;ap-northeast-3;ca-central-1;eu-south-1;eu-west-1;eu-west-2;eu-west-3;eu-north-1;af-south-1;me-south-1;sa-east-1"
+SUPPORTED_REGIONS="us-gov-west-1;us-gov-east-1"
 if [[ ${SUPPORTED_REGIONS} =~ $REGION ]]; then
   echo "Supported region provided"
 else
@@ -400,10 +400,10 @@ echo "S3BUCKETS = $S3BUCKETS"
 if [[ -n $S3BUCKETS ]]; then
   echo "Found S3 buckets for this AWS stack"
   for inst in $S3BUCKETS; do
-    if [[ -n $inst ]]; then  
+    if [[ -n $inst ]]; then
       inst=$(echo $inst | tr -d '\r\n')
       aws s3 rb s3://$inst --force --region $REGION
-      echo "Deleted bucket $inst"    
+      echo "Deleted bucket $inst"
     fi
 
   done
@@ -563,7 +563,7 @@ echo "---------------------------------------------"
 
 ## Delete secret in Secrets Manager
 echo "Checking for secret"
-for secret in maximo-ocp-secret-$UNIQ_STR maximo-mas-secret-$UNIQ_STR; do
+for secret in maximo-ocp-secret-$UNIQ_STR maximo-kubeadmin-secret-$UNIQ_STR maximo-mas-secret-$UNIQ_STR; do
   SECRET=$(aws secretsmanager describe-secret --secret-id $secret --region $REGION | jq ".Name" | tr -d '"')
   echo "SECRET = $SECRET"
   if [[ -n $SECRET ]]; then

aws/db/db-create-iam-user.sh

@@ -29,7 +29,7 @@ else
     if [ $? -ne 0 ]; then
         SCRIPT_STATUS=36
     fi
-    log "aws/db/db-create-iam-user.sh: .......... AWS_ACCESS_KEY_ID:DEPLOY_REGION $AWS_ACCESS_KEY_ID : $DEPLOY_REGION"
+    log "aws/db/db-create-iam-user.sh: .......... AWS_ACCESS_KEY_ID:DEPLOY_REGION : $DEPLOY_REGION"
     # on successful completion of db-create-iam-user.sh, create a file
     echo "COMPLETE" > /tmp/iam-user-created
     chmod a+rw /tmp/iam-user-created