Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Checking in code changes.. #211

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Checking in code changes.. #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ff3330
Checking in code changes..
Oct 11, 2023
09b6d55
Delete aws/ocp-terraform/ocp/variables.tf.bak
NatarajBTI Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions aws/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ master_instance_type = "$MASTER_INSTANCE_TYPE"
worker_instance_type = "$WORKER_INSTANCE_TYPE"
master_replica_count = "$MASTER_NODE_COUNT"
worker_replica_count = "$WORKER_NODE_COUNT"
worker_instance_volume_type = "$EBSVolumeType"
accept_cpd_license = "accept"
new_or_existing_vpc_subnet = "$new_or_existing_vpc_subnet"
enable_permission_quota_check = "$enable_permission_quota_check"
Expand Down Expand Up @@ -562,6 +563,35 @@ fi

if [[ $DEPLOY_MANAGE == "true" && (-n $MAS_JDBC_USER) && (-n $MAS_JDBC_PASSWORD) && (-n $MAS_JDBC_URL) ]]; then
export SSL_ENABLED=false

#Setting the DB values
if [[ -n $MANAGE_TABLESPACE ]]; then
log " $MANAGE_TABLESPACE: $$MANAGE_TABLESPACE"
export MAS_APP_SETTINGS_DB2_SCHEMA=$(echo $MANAGE_TABLESPACE | cut -d ':' -f 1)
export MAS_APP_SETTINGS_TABLESPACE=$(echo $MANAGE_TABLESPACE | cut -d ':' -f 1)
export MAS_APP_SETTINGS_INDEXSPACE=$(echo $MANAGE_TABLESPACE | cut -d ':' -f 2)
else
if [[ ${MAS_JDBC_URL,, } =~ ^jdbc:db2? ]]; then
log "Setting to DB2 Values"
export MAS_APP_SETTINGS_DB2_SCHEMA="maximo"
export MAS_APP_SETTINGS_TABLESPACE="maxdata"
export MAS_APP_SETTINGS_INDEXSPACE="maxindex"
elif [[ ${MAS_JDBC_URL,, } =~ ^jdbc:sql? ]]; then
log "Setting to MSSQL Values"
export MAS_APP_SETTINGS_DB2_SCHEMA="dto"
export MAS_APP_SETTINGS_TABLESPACE="PRIMARY"
export MAS_APP_SETTINGS_INDEXSPACE="PRIMARY"
elif [[ ${MAS_JDBC_URL,, } =~ ^jdbc:oracle? ]]; then
log "Setting to ORACLE Values"
export MAS_APP_SETTINGS_DB2_SCHEMA="maximo"
export MAS_APP_SETTINGS_TABLESPACE="maxdata"
export MAS_APP_SETTINGS_INDEXSPACE="maxindex"
fi
fi
log " MAS_APP_SETTINGS_DB2_SCHEMA: $MAS_APP_SETTINGS_DB2_SCHEMA"
log " DEPLOY_MANAGEMAS_APP_SETTINGS_TABLESPACE: $MAS_APP_SETTINGS_TABLESPACE"
log " MAS_APP_SETTINGS_INDEXSPACE: $MAS_APP_SETTINGS_INDEXSPACE"

if [ -n "$MAS_JDBC_CERT_URL" ]; then
log "MAS_JDBC_CERT_URL is not empty, setting SSL_ENABLED as true"
export SSL_ENABLED=true
Expand Down
27 changes: 19 additions & 8 deletions aws/master-cft/byol-existing-ocp/cft-mas-core-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,19 @@ Parameters:
connects to, for example:
jdbc:db2://1.2.3.4:50051/FTMDB:sslConnection=true;
Type: String
TablespaceSchemaName:
Description: >-
Enter the tablespace, indexspace, & schema names here if you are not using the default names (maximo,maxdata,maxindex,maximo).
Each name separated by a delimeter colon (:). For example in this format: <schema_name>:<tablespace_name>:<indexspace_name>
Type: String
MASManageDBCertificateUrl:
Description: >-
Enter the HTTP or S3 location of the database's public certificate, for
example: s3://masocp-license/db-certificate.crt
Type: String
DBProvisionedVPCId:
Description: >-
Enter the VPC ID where your existing database (DB2 or Oracle or MSSQL) was provisioned on a private subnet to establish
Enter the VPC ID where your existing database (DB2 or Oracle or MSSQL) was provisioned on a private subnet to establish
VPC Peering from this VPC & the VPC created during current stack deployment in order to establish database connection.
Type: String
ImportDemoData:
Expand Down Expand Up @@ -154,7 +159,7 @@ Parameters:
- "Use an existing mongo instance"
MongoDBProvider:
Description: >-
Select the desired MongoDB provider.
Select the desired MongoDB provider.
Note: When selecting MongoDBProvider as MongoDB and MongoDeploymentMode as 'Provision a new mongo instance', a new "MongoDB Community Edition" instance will be provisioned
Type: String
Default: "MongoDB"
Expand Down Expand Up @@ -196,7 +201,7 @@ Parameters:
- "Yes"
Conditions:
MongoUseExistingInstanceCondition: !Equals [!Ref MongoDeploymentMode, "Use an existing mongo instance"]

Metadata:
'AWS::CloudFormation::Interface':
ParameterGroups:
Expand Down Expand Up @@ -227,13 +232,14 @@ Metadata:
- Label:
default: >-
Maximo Manage database configuration (complete this section only if
you chose the 'MAS + Manage' offering type.
In case if this section is left empty and you chose 'MAS + Manage' offering type,
you chose the 'MAS + Manage' offering type.
In case if this section is left empty and you chose 'MAS + Manage' offering type,
then We will provision an internal DB2 instance for Manage)
Parameters:
- MASManageDBUser
- MASManageDBPassword
- MASManageDBJdbcUrl
- TablespaceSchemaName
- MASManageDBCertificateUrl
- DBProvisionedVPCId
- ImportDemoData
Expand All @@ -244,7 +250,7 @@ Metadata:
- MongoDBProvider
- Label:
default: >-
Existing MongoDB / DocumentDB configuration details
Existing MongoDB / DocumentDB configuration details
(complete this section only if MongoDeploymentMode was selected as 'Use an existing mongo instance')
Parameters:
- MongoAdminUsername
Expand All @@ -255,7 +261,7 @@ Metadata:
- Label:
default: AWS MSK Provider
Parameters:
- AWSMSKProvider
- AWSMSKProvider
- Label:
default: >-
Existing Suite License Service connection details (leave this
Expand Down Expand Up @@ -700,7 +706,7 @@ Resources:
- ''' '''
- !Ref OperationalMode
- ''' '''
- !If [MongoUseExistingInstanceCondition, "true", "false"]
- !If [MongoUseExistingInstanceCondition, "true", "false"]
- ''' '''
- !Ref MongoDBProvider
- ''' '''
Expand All @@ -717,6 +723,11 @@ Resources:
- !Ref AWSMSKProvider
- ''' '''
- !Ref DBProvisionedVPCId
- ''' '''' '''
- !Ref EBSVolumeType
- ''' '''
- !Ref TablespaceSchemaName
- ''' '''
- ''' "dev" '
- '2>&1 | tee mas-provisioning.log; '
Tags:
Expand Down
25 changes: 18 additions & 7 deletions aws/master-cft/byol-existing-ocp/cft-mas-core.yaml
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ExocpProvisionedVPCId - Should be included in CFT to mention the existing ocp cluster

Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,19 @@ Parameters:
connects to, for example:
jdbc:db2://1.2.3.4:50051/FTMDB:sslConnection=true;
Type: String
TablespaceSchemaName:
Description: >-
Enter the tablespace, indexspace, & schema names here if you are not using the default names (maximo,maxdata,maxindex,maximo).
Each name separated by a delimeter colon (:). For example in this format: <schema_name>:<tablespace_name>:<indexspace_name>
Type: String
MASManageDBCertificateUrl:
Description: >-
Enter the HTTP or S3 location of the database's public certificate, for
example: s3://masocp-license/db-certificate.crt
Type: String
DBProvisionedVPCId:
Description: >-
Enter the VPC ID where your existing database (DB2 or Oracle or MSSQL) was provisioned on a private subnet to establish
Enter the VPC ID where your existing database (DB2 or Oracle or MSSQL) was provisioned on a private subnet to establish
VPC Peering from this VPC & the VPC created during current stack deployment in order to establish database connection.
Type: String
ImportDemoData:
Expand Down Expand Up @@ -154,7 +159,7 @@ Parameters:
- "Use an existing mongo instance"
MongoDBProvider:
Description: >-
Select the desired MongoDB provider.
Select the desired MongoDB provider.
Note: When selecting MongoDBProvider as MongoDB and MongoDeploymentMode as 'Provision a new mongo instance', a new "MongoDB Community Edition" instance will be provisioned
Type: String
Default: "MongoDB"
Expand Down Expand Up @@ -196,7 +201,7 @@ Parameters:
- "Yes"
Conditions:
MongoUseExistingInstanceCondition: !Equals [!Ref MongoDeploymentMode, "Use an existing mongo instance"]

Metadata:
'AWS::CloudFormation::Interface':
ParameterGroups:
Expand Down Expand Up @@ -227,13 +232,14 @@ Metadata:
- Label:
default: >-
Maximo Manage database configuration (complete this section only if
you chose the 'MAS + Manage' offering type.
In case if this section is left empty and you chose 'MAS + Manage' offering type,
you chose the 'MAS + Manage' offering type.
In case if this section is left empty and you chose 'MAS + Manage' offering type,
then We will provision an internal DB2 instance for Manage)
Parameters:
- MASManageDBUser
- MASManageDBPassword
- MASManageDBJdbcUrl
- TablespaceSchemaName
- MASManageDBCertificateUrl
- DBProvisionedVPCId
- ImportDemoData
Expand All @@ -244,7 +250,7 @@ Metadata:
- MongoDBProvider
- Label:
default: >-
Existing MongoDB / DocumentDB configuration details
Existing MongoDB / DocumentDB configuration details
(complete this section only if MongoDeploymentMode was selected as 'Use an existing mongo instance')
Parameters:
- MongoAdminUsername
Expand Down Expand Up @@ -703,7 +709,7 @@ Resources:
- ''' '''
- !Ref OperationalMode
- ''' '''
- !If [MongoUseExistingInstanceCondition, "true", "false"]
- !If [MongoUseExistingInstanceCondition, "true", "false"]
- ''' '''
- !Ref MongoDBProvider
- ''' '''
Expand All @@ -720,6 +726,11 @@ Resources:
- !Ref AWSMSKProvider
- ''' '''
- !Ref DBProvisionedVPCId
- ''' '''' '''
- !Ref EBSVolumeType
- ''' '''
- !Ref TablespaceSchemaName
- ''' '''
- ''' "prod" '
- '2>&1 | tee mas-provisioning.log; '
Tags:
Expand Down
33 changes: 27 additions & 6 deletions aws/master-cft/byol-ipi/cft-mas-core-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@ Parameters:
- small
- medium
- large
EBSVolumeType:
Description: Select your preferred EBS Volume type for worker nodes based on your performance requirements & cost of the volume types.
For more information on volume types, refer --> https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-volume-types.html
Type: String
Default: gp3
MinLength: '1'
AllowedValues:
- io1
- gp3
EntitledRegistryKey:
Description: Enter the registry key that you downloaded from the IBM Container Library.
Type: String
Expand Down Expand Up @@ -74,14 +83,19 @@ Parameters:
connects to, for example:
jdbc:db2://1.2.3.4:50051/FTMDB:sslConnection=true;
Type: String
TablespaceSchemaName:
Description: >-
Enter the tablespace, indexspace, & schema names here if you are not using the default names (maximo,maxdata,maxindex,maximo).
Each name separated by a delimeter colon (:). For example in this format: <schema_name>:<tablespace_name>:<indexspace_name>
Type: String
MASManageDBCertificateUrl:
Description: >-
Enter the HTTP or S3 location of the database's public certificate, for
example: s3://masocp-license/db-certificate.crt
Type: String
DBProvisionedVPCId:
Description: >-
Enter the VPC ID where your existing database (DB2 or Oracle or MSSQL) was provisioned on a private subnet to establish
Enter the VPC ID where your existing database (DB2 or Oracle or MSSQL) was provisioned on a private subnet to establish
VPC Peering from this VPC & the VPC created during current stack deployment in order to establish database connection.
Type: String
ImportDemoData:
Expand Down Expand Up @@ -163,7 +177,7 @@ Parameters:
- "Use an existing mongo instance"
MongoDBProvider:
Description: >-
Select the desired MongoDB provider.
Select the desired MongoDB provider.
Note: When selecting MongoDBProvider as MongoDB and MongoDeploymentMode as 'Provision a new mongo instance', a new "MongoDB Community Edition" instance will be provisioned
Type: String
Default: "MongoDB"
Expand Down Expand Up @@ -219,6 +233,7 @@ Metadata:
Parameters:
- PublicHostedZone
- ClusterSize
- EBSVolumeType
- Label:
default: Cluster and bootnode access (you must complete this section)
Parameters:
Expand All @@ -233,13 +248,14 @@ Metadata:
- Label:
default: >-
Maximo Manage database configuration (complete this section only if
you chose the 'MAS + Manage' offering type.
In case if this section is left empty and you chose 'MAS + Manage' offering type,
you chose the 'MAS + Manage' offering type.
In case if this section is left empty and you chose 'MAS + Manage' offering type,
then We will provision an internal DB2 instance for Manage)
Parameters:
- MASManageDBUser
- MASManageDBPassword
- MASManageDBJdbcUrl
- TablespaceSchemaName
- MASManageDBCertificateUrl
- DBProvisionedVPCId
- ImportDemoData
Expand All @@ -250,7 +266,7 @@ Metadata:
- MongoDBProvider
- Label:
default: >-
Existing MongoDB / DocumentDB configuration details
Existing MongoDB / DocumentDB configuration details
(complete this section only if MongoDeploymentMode was selected as 'Use an existing mongo instance')
Parameters:
- MongoAdminUsername
Expand All @@ -261,7 +277,7 @@ Metadata:
- Label:
default: AWS MSK Provision
Parameters:
- AWSMSKProvider
- AWSMSKProvider
- Label:
default: >-
Existing Suite License Service connection details (leave this
Expand Down Expand Up @@ -738,6 +754,11 @@ Resources:
- !Ref AWSMSKProvider
- ''' '''
- !Ref DBProvisionedVPCId
- ''' '''' '''
- !Ref EBSVolumeType
- ''' '''
- !Ref TablespaceSchemaName
- ''' '''
- ''' "dev" '
- '2>&1 | tee mas-provisioning.log; '
Tags:
Expand Down
Loading