Skip to content
This repository has been archived by the owner on Apr 21, 2024. It is now read-only.

Commit

Permalink
Version Bump CloudFormation Scripts for wso2is-5.11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Buddhimah authored and VimukthiPerera committed Dec 1, 2020
1 parent 8ad8c57 commit 87e92a8
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 37 deletions.
6 changes: 3 additions & 3 deletions Minimum-HA/nested-identity-minimal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ Resources:
WSO2Network:
Type: AWS::CloudFormation::Stack
Properties:
TemplateURL: https://aws-nested-cloudformation.s3.amazonaws.com/wso2is-5.10.0/network.yaml
TemplateURL: https://aws-nested-cloudformation.s3.amazonaws.com/wso2is-5.11.0/network.yaml
TimeoutInMinutes: '30'
Parameters:
KeyPairName: !Ref KeyPairName
Expand All @@ -129,7 +129,7 @@ Resources:
Database:
Type: AWS::CloudFormation::Stack
Properties:
TemplateURL: https://aws-nested-cloudformation.s3.amazonaws.com/wso2is-5.10.0/database.yaml
TemplateURL: https://aws-nested-cloudformation.s3.amazonaws.com/wso2is-5.11.0/database.yaml
TimeoutInMinutes: '30'
Parameters:
DBUsername: !Ref DBUsername
Expand All @@ -146,7 +146,7 @@ Resources:
WSO2IdentityServerSetup:
Type: AWS::CloudFormation::Stack
Properties:
TemplateURL: https://aws-nested-cloudformation.s3.amazonaws.com/wso2is-5.10.0/identity.yaml
TemplateURL: https://aws-nested-cloudformation.s3.amazonaws.com/wso2is-5.11.0/identity.yaml
TimeoutInMinutes: '30'
Parameters:
AWSAccessKeyId: !Ref AWSAccessKeyId
Expand Down
6 changes: 3 additions & 3 deletions Minimum-HA/nested-identity.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ Resources:
WSO2Network:
Type: AWS::CloudFormation::Stack
Properties:
TemplateURL: https://aws-nested-cloudformation.s3.amazonaws.com/wso2is-5.10.0/network.yaml
TemplateURL: https://aws-nested-cloudformation-iam.s3.amazonaws.com/wso2is-5.11.0/network.yaml
TimeoutInMinutes: '60'
Parameters:
EnvironmentName: !Ref EnvironmentName
Expand All @@ -279,7 +279,7 @@ Resources:
Database:
Type: AWS::CloudFormation::Stack
Properties:
TemplateURL: https://aws-nested-cloudformation.s3.amazonaws.com/wso2is-5.10.0/database.yaml
TemplateURL: https://aws-nested-cloudformation-iam.s3.amazonaws.com/wso2is-5.11.0/database.yaml
TimeoutInMinutes: '60'
Parameters:
DBUsername: !Ref DBUsername
Expand All @@ -298,7 +298,7 @@ Resources:
WSO2IdentityServerSetup:
Type: AWS::CloudFormation::Stack
Properties:
TemplateURL: https://aws-nested-cloudformation.s3.amazonaws.com/wso2is-5.10.0/identity.yaml
TemplateURL: https://aws-nested-cloudformation-iam.s3.amazonaws.com/wso2is-5.11.0/identity.yaml
TimeoutInMinutes: '60'
Parameters:
AWSAccessKeyId: !Ref AWSAccessKeyId
Expand Down
62 changes: 31 additions & 31 deletions product/identity.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -259,18 +259,18 @@ Resources:
- sed -i '/\[master\]/a autosign=true' /etc/puppet/puppet.conf
- service puppetmaster restart
- cd /home/ubuntu
- !Sub "./wso2-init.sh wso2is-5.10.0"
- !Sub "./wso2-init.sh wso2is-5.11.0"
- !Sub "/usr/local/bin/cfn-signal -e $? --stack ${AWS::StackName} --resource PuppetMaster --region ${AWS::Region}"
- !Join
- ''
- - sed -i "s/access-key/
- !Ref AWSAccessKeyId
- /g" /etc/puppet/code/environments/production/modules/is5100/manifests/params.pp
- /g" /etc/puppet/code/environments/production/modules/is5110/manifests/params.pp
- !Join
- ''
- - sed -i "s/REGION_NAME/
- !Ref "AWS::Region"
- /g" /etc/puppet/code/environments/production/modules/is5100/manifests/params.pp
- /g" /etc/puppet/code/environments/production/modules/is5110/manifests/params.pp
- !Join
- ''
- - sed -i "s/CF_ELB_DNS_NAME/
Expand All @@ -279,38 +279,38 @@ Resources:
- DNSName
- >-
/g"
/etc/puppet/code/environments/production/modules/is5100/manifests/params.pp
/etc/puppet/code/environments/production/modules/is5110/manifests/params.pp
- !Join
- ''
- - sed -i "s/CF_DB_USERNAME/
- !Ref DBUsername
- /g" /etc/puppet/code/environments/production/modules/is5100/manifests/params.pp
- /g" /etc/puppet/code/environments/production/modules/is5110/manifests/params.pp
- !Join
- ''
- - sed -i "s/CF_DB_PASSWORD/
- !Ref DBPassword
- /g" /etc/puppet/code/environments/production/modules/is5100/manifests/params.pp
- /g" /etc/puppet/code/environments/production/modules/is5110/manifests/params.pp
- !Join
- ''
- - sed -i "s/CF_DBMS/
- !Select [0, !Split ["_", !FindInMap [ DBEngineMap, !Ref DB, DBEngine]]]
- /g" /etc/puppet/code/environments/production/modules/is5100/manifests/params.pp
- /g" /etc/puppet/code/environments/production/modules/is5110/manifests/params.pp
- !Join
- ''
- - sed -i "s/CF_RDS_URL/
- !Ref WSO2ISDBInstanceEndpointAddress
- /g" /etc/puppet/code/environments/production/modules/is5100/manifests/params.pp
- /g" /etc/puppet/code/environments/production/modules/is5110/manifests/params.pp
- !Join
- ''
- - sed -i "s^secretkey^
- !Ref AWSAccessKeySecret
- ^g" /etc/puppet/code/environments/production/modules/is5100/manifests/params.pp
- ^g" /etc/puppet/code/environments/production/modules/is5110/manifests/params.pp
- export DB_NAME=WSO2_IS_DB
- !Join
- ''
- - sed -i "s/JDK_TYPE/
- !Ref JDK
- /g" /etc/puppet/code/environments/production/modules/is5100/manifests/params.pp
- /g" /etc/puppet/code/environments/production/modules/is5110/manifests/params.pp
- !Join
- ''
- - export DB_HOSTNAME=
Expand Down Expand Up @@ -360,7 +360,7 @@ Resources:
- !Join
- ''
- - sed -i "s/CF_PRODUCT_VERSION/
- 5.10.0
- 5.11.0
- /g" /usr/local/bin/provision_db_is.sh
- bash /usr/local/bin/provision_db_is.sh
PuppetMasterSecurityGroup:
Expand Down Expand Up @@ -441,8 +441,8 @@ Resources:
pip install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-latest.tar.gz
wget https://s3.amazonaws.com/wso2logarchiever/log_archiver/log_archiver.sh
mv log_archiver.sh /usr/lib/
export ProductVersion=5.10.0
sed -i "s/Product_Version/5.10.0/g" /usr/lib/logstash-6.5.1/logstash-IS.conf
export ProductVersion=5.11.0
sed -i "s/Product_Version/5.11.0/g" /usr/lib/logstash-6.5.1/logstash-IS.conf
sed -i "s^secret-key^${AWSAccessKeySecret}^g" /usr/lib/logstash-6.5.1/logstash-IS.conf
sed -i "s/access-key/${AWSAccessKeyId}/g" /usr/lib/logstash-6.5.1/logstash-IS.conf
sed -i "s^ELASTICSEARCH_ENDPOINT^${ElasticSearchEndpoint}^g" /usr/lib/logstash-6.5.1/logstash-IS.conf
Expand All @@ -457,7 +457,7 @@ Resources:
mkdir -p /mnt/efs
mount -t nfs4 -o nfsvers=4.1 ${WSO2ISEFSFileSystem}.efs.${AWS::Region}.amazonaws.com:/ /mnt/efs
sleep 100
export FACTER_profile=is5100
export FACTER_profile=is5110
if [[ ${OperatingSystem} == "Ubuntu1804" ]]; then
puppet agent -vt >> /var/log/puppetlog.log
fi
Expand All @@ -467,18 +467,18 @@ Resources:
sleep 10
if [ ! -d "/mnt/efs/server/userstores" ]; then
mkdir -p /mnt/efs/server/userstores
cp -r /usr/lib/wso2/wso2is/5.10.0/wso2is-5.10.0/repository/deployment/server/userstores /mnt/efs/userstores
cp -r /usr/lib/wso2/wso2is/5.11.0/wso2is-5.11.0/repository/deployment/server/userstores /mnt/efs/userstores
fi
rm -rf /usr/lib/wso2/wso2is/5.10.0/wso2is-5.10.0/repository/deployment/server/userstores
ln -s /mnt/efs/server/userstores /usr/lib/wso2/wso2is/5.10.0/wso2is-5.10.0/repository/deployment/server/userstores
rm -rf /usr/lib/wso2/wso2is/5.11.0/wso2is-5.11.0/repository/deployment/server/userstores
ln -s /mnt/efs/server/userstores /usr/lib/wso2/wso2is/5.11.0/wso2is-5.11.0/repository/deployment/server/userstores
if [ ! -d "/mnt/efs/tenants" ]; then
mkdir -p /mnt/efs/tenants
cp -r /usr/lib/wso2/wso2is/5.10.0/wso2is-5.10.0/repository/tenants /mnt/efs
cp -r /usr/lib/wso2/wso2is/5.11.0/wso2is-5.11.0/repository/tenants /mnt/efs
fi
rm -rf /usr/lib/wso2/wso2is/5.10.0/wso2is-5.10.0/repository/tenants
ln -s /mnt/efs/tenants /usr/lib/wso2/wso2is/5.10.0/wso2is-5.10.0/repository/tenants
rm -rf /usr/lib/wso2/wso2is/5.11.0/wso2is-5.11.0/repository/tenants
ln -s /mnt/efs/tenants /usr/lib/wso2/wso2is/5.11.0/wso2is-5.11.0/repository/tenants
echo "${WSO2ISEFSFileSystem}:/ /mnt/efs efs defaults,_netdev 0 0" >> /etc/fstab
/usr/lib/wso2/wso2is/5.10.0/wso2is-5.10.0/bin/wso2server.sh start
/usr/lib/wso2/wso2is/5.11.0/wso2is-5.11.0/bin/wso2server.sh start
${CustomUserData}
sleep 30
if [[ ${OperatingSystem} == "Ubuntu1804" ]]; then
Expand Down Expand Up @@ -598,8 +598,8 @@ Resources:
pip install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-latest.tar.gz
wget https://s3.amazonaws.com/wso2logarchiever/log_archiver/log_archiver.sh
mv log_archiver.sh /usr/lib/
export ProductVersion=5.10.0
sed -i "s/Product_Version/5.10.0/g" /usr/lib/logstash-6.5.1/logstash-IS.conf
export ProductVersion=5.11.0
sed -i "s/Product_Version/5.11.0/g" /usr/lib/logstash-6.5.1/logstash-IS.conf
sed -i "s^secret-key^${AWSAccessKeySecret}^g" /usr/lib/logstash-6.5.1/logstash-IS.conf
sed -i "s/access-key/${AWSAccessKeyId}/g" /usr/lib/logstash-6.5.1/logstash-IS.conf
sed -i "s^ELASTICSEARCH_ENDPOINT^${ElasticSearchEndpoint}^g" /usr/lib/logstash-6.5.1/logstash-IS.conf
Expand All @@ -614,7 +614,7 @@ Resources:
mkdir -p /mnt/efs
mount -t nfs4 -o nfsvers=4.1 ${WSO2ISEFSFileSystem}.efs.${AWS::Region}.amazonaws.com:/ /mnt/efs
sleep 300
export FACTER_profile=is5100
export FACTER_profile=is5110
if [[ ${OperatingSystem} == "Ubuntu1804" ]]; then
puppet agent -vt >> /var/log/puppetlog.log
fi
Expand All @@ -624,18 +624,18 @@ Resources:
sleep 10
if [ ! -d "/mnt/efs/server/userstores" ]; then
mkdir -p /mnt/efs/server/userstores
cp -r /usr/lib/wso2/wso2is/5.10.0/wso2is-5.10.0/repository/deployment/server/userstores /mnt/efs/userstores
cp -r /usr/lib/wso2/wso2is/5.11.0/wso2is-5.11.0/repository/deployment/server/userstores /mnt/efs/userstores
fi
rm -rf /usr/lib/wso2/wso2is/5.10.0/wso2is-5.10.0/repository/deployment/server/userstores
ln -s /mnt/efs/server/userstores /usr/lib/wso2/wso2is/5.10.0/wso2is-5.10.0/repository/deployment/server/userstores
rm -rf /usr/lib/wso2/wso2is/5.11.0/wso2is-5.11.0/repository/deployment/server/userstores
ln -s /mnt/efs/server/userstores /usr/lib/wso2/wso2is/5.11.0/wso2is-5.11.0/repository/deployment/server/userstores
if [ ! -d "/mnt/efs/tenants" ]; then
mkdir -p /mnt/efs/tenants
cp -r /usr/lib/wso2/wso2is/5.10.0/wso2is-5.10.0/repository/tenants /mnt/efs
cp -r /usr/lib/wso2/wso2is/5.11.0/wso2is-5.11.0/repository/tenants /mnt/efs
fi
rm -rf /usr/lib/wso2/wso2is/5.10.0/wso2is-5.10.0/repository/tenants
ln -s /mnt/efs/tenants /usr/lib/wso2/wso2is/5.10.0/wso2is-5.10.0/repository/tenants
rm -rf /usr/lib/wso2/wso2is/5.11.0/wso2is-5.11.0/repository/tenants
ln -s /mnt/efs/tenants /usr/lib/wso2/wso2is/5.11.0/wso2is-5.11.0/repository/tenants
echo "${WSO2ISEFSFileSystem}:/ /mnt/efs efs defaults,_netdev 0 0" >> /etc/fstab
/usr/lib/wso2/wso2is/5.10.0/wso2is-5.10.0/bin/wso2server.sh start
/usr/lib/wso2/wso2is/5.11.0/wso2is-5.11.0/bin/wso2server.sh start
${CustomUserData}
sleep 30
if [[ ${OperatingSystem} == "Ubuntu1804" ]]; then
Expand Down

0 comments on commit 87e92a8

Please sign in to comment.