Checking in code for rt 7.10.6 version

2026-01-20 22:06:55 -06:00 · 2020-11-20 15:04:58 -08:00
parent ddaa30af90
commit 0451412772
5 changed files with 2559 additions and 0 deletions
--- a/Amazon/Marketplace/v7106/templates/jfrog-artifactory-core-infrastructure.template.yaml
+++ b/Amazon/Marketplace/v7106/templates/jfrog-artifactory-core-infrastructure.template.yaml
@@ -0,0 +1,378 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Description: 'JFrog Artifactory Quick Start Deployment (qs-1qpmmjh61)'
+Parameters:
+  VpcId:
+    Type: AWS::EC2::VPC::Id
+  VpcCidr:
+    Description: CIDR block for the VPC
+    AllowedPattern: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(1[6-9]|2[0-8]))$
+    ConstraintDescription: CIDR block parameter must be in the form x.x.x.x/16-28
+    Default: 10.0.0.0/16
+    Type: String
+  PrivateSubnet1Cidr:
+    AllowedPattern: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(1[6-9]|2[0-8]))$
+    ConstraintDescription: CIDR block parameter must be in the form x.x.x.x/16-28
+    Default: 10.0.0.0/19
+    Type: String
+  PrivateSubnet2Cidr:
+    AllowedPattern: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(1[6-9]|2[0-8]))$
+    ConstraintDescription: CIDR block parameter must be in the form x.x.x.x/16-28
+    Default: 10.0.32.0/19
+    Type: String
+  PrivateSubnet3Cidr:
+    AllowedPattern: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(1[6-9]|2[0-8]))$
+    ConstraintDescription: CIDR block parameter must be in the form x.x.x.x/16-28
+    Default: 10.0.64.0/19
+    Type: String
+  SubnetIds:
+    Type: List<AWS::EC2::Subnet::Id>
+  DatabaseAllocatedStorage:
+    Type: Number
+  MultiAzDatabase:
+    Type: String
+  DatabaseEngine:
+    Type: String
+  DatabaseUser:
+    Type: String
+  DatabasePassword:
+    NoEcho: 'true'
+    Type: String
+  DatabaseInstance:
+    Type: String
+  DatabaseName:
+    Type: String
+  ArtifactoryS3IAMUser:
+    NoEcho: 'true'
+    Type: String
+  ArtifactoryProduct:
+    Default: JFrog-Artifactory-Pro
+    Type: String
+  ReleaseStage:
+    Default: GA
+    Type: String
+  InstanceType:
+    Default: m5.xlarge
+    Type: String
+
+Mappings:
+  DatabaseMap:
+    Postgres:
+      Name: postgresql
+      DatabaseVersion: 11.5
+      Driver: "org.postgresql.Driver"
+      Plugin: postgresql-42.2.9.jar
+      PluginURL: https://jdbc.postgresql.org/download/
+      port: "5432"
+      extraDatabaseOps: ""
+  ReleaseStageMap:
+    BETA:
+      ProDockerRepo: "earlyaccess-docker.jfrog.io/jfrog/artifactory-pro"
+      JcrDockerRepo: "earlyaccess-docker.jfrog.io/jfrog/artifactory-jcr"
+      NginxDockerRepo: "earlyaccess-docker.jfrog.io/jfrog/nginx-artifactory-pro"
+    GA:
+      ProDockerRepo: "docker.bintray.io/jfrog/artifactory-pro"
+      JcrDockerRepo: "docker.bintray.io/jfrog/artifactory-jcr"
+      NginxDockerRepo: "docker.bintray.io/jfrog/nginx-artifactory-pro"
+  ProductMap:
+    JFrog-Container-Registry:
+      RepoName: JcrDockerRepo
+    JFrog-Artifactory-Pro:
+      RepoName: ProDockerRepo
+  JavaOptionstoInstance:
+    m5.large:
+      Min: 4
+      Max: 4
+      DeploymentSize: xxSmall
+    m5.xlarge:
+      Min: 8
+      Max: 12
+      DeploymentSize: xSmall
+    m5.2xlarge:
+      Min: 16
+      Max: 24
+      DeploymentSize: Small
+    m5.4xlarge:
+      Min: 32
+      Max: 48
+      DeploymentSize: Medium
+    m5.8xlarge:
+      Min: 64
+      Max: 96
+      DeploymentSize: Large
+    m5.12xlarge:
+      Min: 96
+      Max: 144
+      DeploymentSize: xLarge
+    m5.16xlarge:
+      Min: 128
+      Max: 192
+      DeploymentSize: xxLarge
+    m5.24xlarge:
+      Min: 192
+      Max: 288
+      DeploymentSize: xxxLarge
+    m5.metal:
+      Min: 192
+      Max: 288
+      DeploymentSize: xxxLarge
+    m5d.large:
+      Min: 4
+      Max: 4
+      DeploymentSize: xxSmall
+    m5d.xlarge:
+      Min: 8
+      Max: 12
+      DeploymentSize: xSmall
+    m5d.2xlarge:
+      Min: 16
+      Max: 24
+      DeploymentSize: Small
+    m5d.4xlarge:
+      Min: 32
+      Max: 48
+      DeploymentSize: Medium
+    m5d.8xlarge:
+      Min: 64
+      Max: 96
+      DeploymentSize: Large
+    m5d.12xlarge:
+      Min: 96
+      Max: 144
+      DeploymentSize: xLarge
+    m5d.16xlarge:
+      Min: 128
+      Max: 192
+      DeploymentSize: xxLarge
+    m5d.24xlarge:
+      Min: 192
+      Max: 288
+      DeploymentSize: xxxLarge
+    m5d.metal:
+      Min: 192
+      Max: 288
+      DeploymentSize: xxxLarge
+    m5a.large:
+      Min: 4
+      Max: 4
+      DeploymentSize: xxSmall
+    m5a.xlarge:
+      Min: 8
+      Max: 12
+      DeploymentSize: xSmall
+    m5a.2xlarge:
+      Min: 16
+      Max: 24
+      DeploymentSize: Small
+    m5a.4xlarge:
+      Min: 32
+      Max: 48
+      DeploymentSize: Medium
+    m5a.8xlarge:
+      Min: 64
+      Max: 96
+      DeploymentSize: Large
+    m5a.12xlarge:
+      Min: 96
+      Max: 144
+      DeploymentSize: xLarge
+    m5a.16xlarge:
+      Min: 128
+      Max: 192
+      DeploymentSize: xxLarge
+    m5a.24xlarge:
+      Min: 192
+      Max: 288
+      DeploymentSize: xxxLarge
+    m5ad.large:
+      Min: 4
+      Max: 4
+      DeploymentSize: xxSmall
+    m5ad.xlarge:
+      Min: 8
+      Max: 12
+      DeploymentSize: xSmall
+    m5ad.2xlarge:
+      Min: 16
+      Max: 24
+      DeploymentSize: Small
+    m5ad.4xlarge:
+      Min: 32
+      Max: 48
+      DeploymentSize: Medium
+    m5ad.12xlarge:
+      Min: 96
+      Max: 144
+      DeploymentSize: xLarge
+    m5ad.24xlarge:
+      Min: 192
+      Max: 288
+      DeploymentSize: xxxLarge
+Resources:
+  ArtifactoryDatabaseSubnetGroup:
+    Type: AWS::RDS::DBSubnetGroup
+    Properties:
+      DBSubnetGroupDescription: Private Subnets available to the RDS Instance(s)
+      SubnetIds: !Ref SubnetIds
+  ArtifactoryDatabase:
+    Type: AWS::RDS::DBInstance
+    Properties:
+      AllocatedStorage: !Ref DatabaseAllocatedStorage
+      MultiAZ: !Ref MultiAzDatabase
+      Engine: !Ref DatabaseEngine
+      EngineVersion: !FindInMap
+        - DatabaseMap
+        - !Ref DatabaseEngine
+        - DatabaseVersion
+      MasterUsername: !Ref DatabaseUser
+      MasterUserPassword: !Ref DatabasePassword
+      DBInstanceClass: !Ref DatabaseInstance
+      DBName: !Ref DatabaseName
+      DBSubnetGroupName: !Ref  ArtifactoryDatabaseSubnetGroup
+      VPCSecurityGroups:
+        - !Ref ArtifactoryDatabaseSG
+  ArtifactoryDatabaseSG:
+    Type: AWS::EC2::SecurityGroup
+    Properties:
+      Tags:
+        - Key: Name
+          Value: artifactory-rds-sg
+      GroupDescription: SG for RDS Instance to allow communication from the Bastion and Artifactory servers.
+      VpcId: !Ref VpcId
+      SecurityGroupIngress:
+        - IpProtocol: tcp
+          FromPort: 22
+          ToPort: 22
+          CidrIp: !Ref VpcCidr
+        - IpProtocol: tcp
+          FromPort: !FindInMap
+            - DatabaseMap
+            - !Ref DatabaseEngine
+            - port
+          ToPort: !FindInMap
+            - DatabaseMap
+            - !Ref DatabaseEngine
+            - port
+          CidrIp: !Ref PrivateSubnet1Cidr
+        - IpProtocol: tcp
+          FromPort: !FindInMap
+            - DatabaseMap
+            - !Ref DatabaseEngine
+            - port
+          ToPort: !FindInMap
+            - DatabaseMap
+            - !Ref DatabaseEngine
+            - port
+          CidrIp: !Ref PrivateSubnet2Cidr
+        - IpProtocol: tcp
+          FromPort: !FindInMap
+            - DatabaseMap
+            - !Ref DatabaseEngine
+            - port
+          ToPort: !FindInMap
+            - DatabaseMap
+            - !Ref DatabaseEngine
+            - port
+          CidrIp: !Ref PrivateSubnet3Cidr
+      SecurityGroupEgress:
+        - IpProtocol: tcp
+          FromPort: 22
+          ToPort: 22
+          CidrIp: 0.0.0.0/0
+        - IpProtocol: tcp
+          FromPort: 80
+          ToPort: 80
+          CidrIp: 0.0.0.0/0
+        - IpProtocol: tcp
+          FromPort: 443
+          ToPort: 443
+          CidrIp: 0.0.0.0/0
+  ArtifactoryS3Bucket:
+    Type: AWS::S3::Bucket
+    Properties:
+      AccessControl: Private
+      BucketEncryption:
+        ServerSideEncryptionConfiguration:
+          - ServerSideEncryptionByDefault:
+              SSEAlgorithm: AES256
+  ArtifactoryS3IAMPolicy:
+    Type: AWS::IAM::Policy
+    Properties:
+      PolicyName: S3BucketPermissions
+      PolicyDocument:
+        Version: 2012-10-17
+        Statement:
+          - Sid: S3BucketPermissions
+            Effect: Allow
+            Action:
+              - s3:*
+            Resource:
+              - Fn::Join:
+                - ''
+                - - !Sub "arn:${AWS::Partition}:s3:::"
+                  - !Ref ArtifactoryS3Bucket
+              - Fn::Join:
+                - ''
+                - - !Sub "arn:${AWS::Partition}:s3:::"
+                  - !Ref ArtifactoryS3Bucket
+                  - "/*"
+      Users:
+        - !Ref ArtifactoryS3IAMUser
+Outputs:
+  S3Bucket:
+    Value: !Ref ArtifactoryS3Bucket
+    Description: Actual S3 bucket created for Artifactory
+  DatabaseDriver:
+    Value: !FindInMap [DatabaseMap, !Ref DatabaseEngine, Driver]
+  DatabasePlugin:
+    Value: !FindInMap [DatabaseMap, !Ref DatabaseEngine, Plugin]
+  DatabasePluginUrl:
+    Value: !Sub
+      - "${MainURL}${PluginVersion}"
+      - {
+        MainURL: !FindInMap [DatabaseMap, !Ref DatabaseEngine, PluginURL],
+        PluginVersion: !FindInMap [DatabaseMap, !Ref DatabaseEngine, Plugin]
+        }
+  DatabaseType:
+    Value: !FindInMap [DatabaseMap, !Ref DatabaseEngine, Name]
+  DatabaseUrl:
+    Value: !Sub
+      - "jdbc:${DatabaseType}://${ArtifactoryDatabaseEndpointAddress}:${port}/${DatabaseName}${extraDatabaseOps}"
+      - {
+        DatabaseType: !FindInMap [DatabaseMap, !Ref DatabaseEngine, Name],
+        ArtifactoryDatabaseEndpointAddress: !GetAtt ArtifactoryDatabase.Endpoint.Address,
+        port: !FindInMap [DatabaseMap, !Ref DatabaseEngine, port],
+        extraDatabaseOps: !FindInMap [DatabaseMap, !Ref DatabaseEngine, extraDatabaseOps],
+        }
+  XrayMasterDatabaseUrl:
+    Value: !Sub
+      - "${ArtifactoryDatabaseEndpointAddress}:${port}/${DatabaseName}?sslmode=disable"
+      - {
+        ArtifactoryDatabaseEndpointAddress: !GetAtt ArtifactoryDatabase.Endpoint.Address,
+        port: !FindInMap [DatabaseMap, !Ref DatabaseEngine, port],
+        }
+  XrayDatabaseUrl:
+    Value: !Sub
+      - "${ArtifactoryDatabaseEndpointAddress}:${port}/xraydb?sslmode=disable"
+      - {
+        ArtifactoryDatabaseEndpointAddress: !GetAtt ArtifactoryDatabase.Endpoint.Address,
+        port: !FindInMap [DatabaseMap, !Ref DatabaseEngine, port],
+        }
+  ProDockerRepo:
+    Value: !FindInMap
+      - ReleaseStageMap
+      - !Ref ReleaseStage
+      - !FindInMap
+        - ProductMap
+        - !Ref ArtifactoryProduct
+        - RepoName
+  NginxDockerRepo:
+    Value: !FindInMap [ReleaseStageMap, !Ref ReleaseStage, NginxDockerRepo]
+  JavaOpts:
+    Value: !Sub
+      - "-Xms${min}g -Xmx${max}g"
+      - {
+        min: !FindInMap [JavaOptionstoInstance, !Ref InstanceType, Min],
+        max: !FindInMap [JavaOptionstoInstance, !Ref InstanceType, Max]
+      }
+  DeploymentSize:
+    Value: !FindInMap [JavaOptionstoInstance, !Ref InstanceType, DeploymentSize]
--- a/Amazon/Marketplace/v7106/templates/jfrog-artifactory-ec2-existing-vpc.template.yaml
+++ b/Amazon/Marketplace/v7106/templates/jfrog-artifactory-ec2-existing-vpc.template.yaml
--- a/Amazon/Marketplace/v7106/templates/jfrog-artifactory-ec2-instance.template.yaml
+++ b/Amazon/Marketplace/v7106/templates/jfrog-artifactory-ec2-instance.template.yaml
@@ -0,0 +1,417 @@
+AWSTemplateFormatVersion: "2010-09-09"
+Description: "Deploys the EC2 Autoscaling, LaunchConfig and Instance for Artifactory (qs-1qpmmjh5o)"
+Parameters:
+  PrivateSubnet1Id:
+    Type: 'AWS::EC2::Subnet::Id'
+  PrivateSubnet2Id:
+    Type: 'AWS::EC2::Subnet::Id'
+  MinScalingNodes:
+    Type: Number
+  MaxScalingNodes:
+    Type: Number
+  DeploymentTag:
+    Type: String
+  HostRole:
+    Type: String
+  AmiId:
+    Type: String
+  ArtifactoryProduct:
+    Type: String
+  QsS3BucketName:
+    Type: String
+  QsS3KeyPrefix:
+    Type: String
+  QsS3Uri:
+    Type: String
+  ArtifactoryLicense1:
+    Type: String
+  ArtifactoryLicense2:
+    Type: String
+  ArtifactoryLicense3:
+    Type: String
+  ArtifactoryLicense4:
+    Type: String
+  ArtifactoryLicense5:
+    Type: String
+  ArtifactoryLicense6:
+    Type: String
+  ArtifactoryServerName:
+    Type: String
+  Certificate:
+    Type: String
+  CertificateKey:
+    Type: String
+    NoEcho: 'true'
+  CertificateDomain:
+    Type: String
+  EnableSSL:
+    Type: String
+  ArtifactoryIamAcessKey:
+    Type: String
+    NoEcho: 'true'
+  SecretAccessKey:
+    Type: String
+    NoEcho: 'true'
+  ArtifactoryS3Bucket:
+    Type: String
+  DatabaseUrl:
+    Type: String
+  DatabaseDriver:
+    Type: String
+  DatabasePluginUrl:
+    Type: String
+  DatabasePlugin:
+    Type: String
+  DatabaseType:
+    Type: String
+  DatabaseUser:
+    Type: String
+  DatabasePassword:
+    Type: String
+    NoEcho: 'true'
+  ArtifactoryPrimary:
+    Type: String
+  MasterKey:
+    Type: String
+    NoEcho: 'true'
+  ExtraJavaOptions:
+    Type: String
+  ArtifactoryVersion:
+    Type: String
+  KeyPairName:
+    Type: AWS::EC2::KeyPair::KeyName
+  TargetGroupARN:
+    Type: String
+  SSLTargetGroupARN:
+    Type: String
+  InternalTargetGroupARN:
+    Type: String
+  HostProfile:
+    Type: String
+  SecurityGroups:
+    Type: String
+  InstanceType:
+    Type: String
+  VolumeSize:
+    Type: Number
+  KeystorePassword:
+    Description: Default Keystore from Java in which we upgrade.
+    Type: String
+    NoEcho: 'true'
+  AnsibleVaultPass:
+    Description: Ansiblevault Password to secure the artifactory.yml
+    Type: String
+    NoEcho: 'true'
+# To populate additional mappings use the following with the desired --region
+# aws --region us-west-2 ec2 describe-images --owners amazon --filters 'Name=name,Values=amzn-ami-hvm-2018.03.0.20181129-x86_64-gp2' 'Name=state,Values=available' --output json | jq -r '.Images | sort_by(.CreationDate) | last(.[]).ImageId'
+Mappings:
+  AWSAMIRegionMap:
+    ap-northeast-1:
+      AMZNLINUXHVM: ami-079e6fb1e856e80c1
+      "Artifactory721": ami-09dfb20a591375d09
+      "Artifactory755": ami-09dfb20a591375d09 # TODO: Get correct ami
+      "Jcr721": ami-0d87bf5404e186c90
+    ap-northeast-2:
+      AMZNLINUXHVM: ami-0e4a253fb5f082688
+      "Artifactory721": ami-0eb86b82de93a34fb
+      "Artifactory755": ami-0eb86b82de93a34fb # TODO: Get correct ami
+      "Jcr721": ami-047275320dc0101df
+    ap-south-1:
+      AMZNLINUXHVM: ami-01e074f40dfb9999d
+      "Artifactory721": ami-01b828aa6cc99a322
+      "Artifactory755": ami-01b828aa6cc99a322 # TODO: Get correct ami
+      "Jcr721": ami-003e20ccb4b8b1efc
+    ap-southeast-1:
+      AMZNLINUXHVM: ami-0d9233e8ce73df7b2
+      "Artifactory721": ami-04a94cc4dc0d08c98
+      "Artifactory755": ami-04a94cc4dc0d08c98 # TODO: Get correct ami
+      "Jcr721": ami-016d81f9a055d84f7
+    ap-southeast-2:
+      AMZNLINUXHVM: ami-0c91f97cadcc8499e
+      "Artifactory721": ami-030871aa8d1f0689e
+      "Artifactory755": ami-030871aa8d1f0689e # TODO: Get correct ami
+      "Jcr721": ami-0a257f38f4e17b489
+    ca-central-1:
+      AMZNLINUXHVM: ami-003a0ba7ea76b2785
+      "Artifactory721": ami-0148cebea7bea4aaf
+      "Artifactory755": ami-0148cebea7bea4aaf # TODO: Get correct ami
+      "Jcr721": ami-0366fde97d0c9c63c
+    eu-central-1:
+      AMZNLINUXHVM: ami-0ab838eeee7f316eb
+      "Artifactory721": ami-07961f7c210143a42
+      "Artifactory755": ami-07961f7c210143a42 # TODO: Get correct ami
+      "Jcr721": ami-025ce18f43dbbee65
+    eu-west-1:
+      AMZNLINUXHVM: ami-071f4ce599deff521
+      "Artifactory721": ami-0171b8d46941b4ca1
+      "Artifactory755": ami-0171b8d46941b4ca1 # TODO: Get correct ami
+      "Jcr721": ami-0a0c02357d264c397
+    sa-east-1:
+      AMZNLINUXHVM: ami-04b202bf877b5027b
+      "Artifactory721": ami-0596f196b273bb8a6
+      "Artifactory755": ami-0596f196b273bb8a6 # TODO: Get correct ami
+      "Jcr721": ami-0f5f29385fc7cf6a9
+    us-east-1:
+      AMZNLINUXHVM     : ami-09d069a04349dc3cb
+      "Artifactory700" : ami-06baee01fb2ef01d2
+      "Artifactory702" : ami-085b1acc8e8b5b039
+      "Artifactory721" : ami-0d4d4252cdc2b6f11
+      "Artifactory755" : ami-07c0a3d7663fcafb9  # TODO: Get correct ami
+      "Artifactory773" : ami-0e1639df4df532641  # partnership account + seller account
+      "Artifactory7102": ami-0d3aaf4303a264d04 # seller account (shared with partnership account)
+      "Jcr720"         : ami-05aa02eddf5f692b7
+      "Jcr721"         : ami-04fed5fc210272dfe
+      "Jcr7102"        : ami-0508370f82ef2e50d
+      "Artifactory7105": ami-0ebadbf3bfd796159 # partnership account
+      "Jcr7105"        : ami-044f911cbd1abfa35 # partnership account
+      "Artifactory7106": ami-031178f02b6163ccc # seller account (shared with partnership account)
+    us-east-2:
+      AMZNLINUXHVM     : ami-0d542ef84ec55d71c
+      "Artifactory721" : ami-0a913af05ccdaa522
+      "Artifactory755" : ami-05071c07a672ddf54 # TODO: Get correct ami - using ami generated by myself
+      "Jcr721"         : ami-0d50790b8fb747584
+      "Artifactory7105": ami-0b6cf479cb95fdc0f # partnership account
+      "Jcr7105"        : ami-0b36c6bc47680e08b # partnership account
+    us-west-1:
+      AMZNLINUXHVM     : ami-04bc3da8f14823e88
+      "Artifactory721" : ami-068cd684b4d3a3a86
+      "Artifactory755" : ami-068cd684b4d3a3a86 # TODO: Get correct ami
+      "Jcr721"         : ami-0e1cef33ea2778bd5
+      "Artifactory7105": ami-08bffb00bf4bcf9e5 # partnership account
+      "Jcr7105"        : ami-0c2c7f6ebd9c5f93a # partnership account
+    us-west-2:
+      AMZNLINUXHVM     : ami-01460aa81365561fe
+      "700"            : ami-000937e944ea194bf
+      "Artifactory721" : ami-0c132dd3640519a35
+      "Artifactory755" : ami-0007155f7b7de9386 # TODO: Get correct ami
+      "Artifactory773" : ami-0a1b8c5bd6ea279b0  # partnership account + seller account
+      "Jcr721"         : ami-083542bb4f8afa3db
+      "Artifactory7105": ami-00e814a57b5142b4f # partnership account
+      "Jcr7105"        : ami-0d310395b75af75bd # partnership account
+    us-gov-east-1:
+      AMZNLINUX2       : ami-7c2bc80d
+      "Artifactory755" : ami-0732b9134b39caf5c
+      "Artifactory7102": ami-0f5ce3b2c087a8098
+      "Artifactory7105": ami-011a5a1aa6a1e6cf2
+    us-gov-west-1:
+      AMZNLINUX2       : ami-a03768c1
+      "Artifactory755" : ami-0b9d3e9ee5ffdc491
+      "Artifactory7105": ami-0c42aaa5df6428bd7
+  ArtifactoryProductMap:
+    JFrog-Container-Registry:
+      "720": "Jcr720"
+      "721": "Jcr721"
+      "743": "Jcr743"
+      "7102": "Jcr7102"
+      "7105": "Jcr7105"
+      product: "jcr"
+    JFrog-Artifactory-Pro:
+      "700": "Artifactory700"
+      "702": "Artifactory702"
+      "721": "Artifactory721"
+      "755": "Artifactory755"
+      "773": "Artifactory773"
+      "7102": "Artifactory7102"
+      "7105": "Artifactory7105"
+      "7106": "Artifactory7106"
+      product: "artifactory"
+Resources:
+  ArtifactoryScalingGroup:
+    Type: 'AWS::AutoScaling::AutoScalingGroup'
+    Properties:
+      LaunchConfigurationName: !Ref ArtifactoryLaunchConfiguration
+      VPCZoneIdentifier:
+        - !Ref PrivateSubnet1Id
+        - !Ref PrivateSubnet2Id
+      MinSize: !Ref MinScalingNodes
+      MaxSize: !Ref MaxScalingNodes
+      Cooldown: '300'
+      DesiredCapacity: !Ref MinScalingNodes
+      TargetGroupARNs:
+        - !Ref TargetGroupARN
+        - !Ref SSLTargetGroupARN
+        - !Ref InternalTargetGroupARN
+      HealthCheckType: ELB
+      HealthCheckGracePeriod: 900
+      Tags:
+        - Key: Name
+          Value: !Ref DeploymentTag
+          PropagateAtLaunch: true
+    CreationPolicy:
+      ResourceSignal:
+        Count: 1
+        Timeout: PT30M
+
+  ArtifactoryLaunchConfiguration:
+    Type: 'AWS::AutoScaling::LaunchConfiguration'
+    Metadata:
+      'AWS::CloudFormation::Authentication':
+        S3AccessCreds:
+          type: S3
+          roleName:
+            - !Ref HostRole  # !Ref ArtifactoryHostRole
+          buckets:
+            - !Ref QsS3BucketName
+      'AWS::CloudFormation::Init':
+        configSets:
+          artifactory_install:
+            - "config-artifactory-master"
+            - "secure-artifactory"
+        config-artifactory-master:
+          files:
+            /root/.jfrog_ami/artifactory.yml:
+              content: !Sub
+                - |
+                  # Base install for Artifactory
+                  - import_playbook: site-artifactory.yml
+                    vars:
+                      artifactory_license1: ${ArtifactoryLicense1}
+                      artifactory_license2: ${ArtifactoryLicense2}
+                      artifactory_license3: ${ArtifactoryLicense3}
+                      artifactory_license4: ${ArtifactoryLicense4}
+                      artifactory_license5: ${ArtifactoryLicense5}
+                      artifactory_license6: ${ArtifactoryLicense6}
+                      artifactory_product: ${product}
+                      artifactory_flavour: "{{ 'pro' if '${product}' == 'artifactory' else 'jcr' if '${product}' == 'jcr' }}"
+                      artifactory_server_name: ${ArtifactoryServerName}
+                      server_name: ${ArtifactoryServerName}.${CertificateDomain}
+                      s3_region: ${AWS::Region}
+                      s3_access_key: ${ArtifactoryIamAcessKey}
+                      s3_access_secret_key: ${SecretAccessKey}
+                      s3_bucket: ${ArtifactoryS3Bucket}
+                      certificate: ${Certificate}
+                      certificate_key: ${CertificateKey}
+                      certificate_domain: ${CertificateDomain}
+                      enable_ssl: ${EnableSSL}
+                      ssl_dir: /etc/pki/tls/certs
+                      db_type: ${DatabaseType}
+                      db_driver: ${DatabaseDriver}
+                      db_url: ${DatabaseUrl}
+                      db_user: ${DatabaseUser}
+                      db_password: ${DatabasePassword}
+                      # db_download_url: https://jdbc.postgresql.org/download/postgresql-42.2.12.jar
+                      art_primary: ${ArtifactoryPrimary}
+                      master_key: ${MasterKey}
+                      join_key: ${MasterKey}
+                      extra_java_opts: ${ExtraJavaOptions}
+                      artifactory_version: ${ArtifactoryVersion}
+                      artifactory_keystore:
+                        path: /opt/jfrog/artifactory/app/third-party/java/lib/security/cacerts
+                        default_password: changeit
+                        new_keystore_pass: ${KeystorePassword}
+                      artifactory_java_db_drivers:
+                        - name: ${DatabasePlugin}
+                          url: ${DatabasePluginUrl}
+                          owner: artifactory
+                          group: artifactory
+                - {
+                  product: !FindInMap [ArtifactoryProductMap, !Ref ArtifactoryProduct, product]
+                }
+              mode: "0400"
+            /root/.vault_pass.txt:
+              content: !Sub |
+                ${AnsibleVaultPass}
+              mode: "0400"
+            /root/.secureit.sh:
+              content:
+                ansible-vault encrypt /root/.jfrog_ami/artifactory.yml --vault-id /root/.vault_pass.txt
+              mode: "0770"
+        secure-artifactory:
+          commands:
+            'secure ansible playbook':
+              command: '/root/.secureit.sh'
+              ignoreErrors: 'false'
+    Properties:
+      AssociatePublicIpAddress: false
+      KeyName: !Ref KeyPairName
+      IamInstanceProfile: !Ref HostProfile
+      ImageId: !FindInMap
+        - AWSAMIRegionMap
+        - !Ref 'AWS::Region'
+        - !FindInMap
+          - ArtifactoryProductMap
+          - !Ref ArtifactoryProduct
+          - !Ref AmiId
+      SecurityGroups:
+        - !Ref SecurityGroups
+      InstanceType: !Ref InstanceType
+      BlockDeviceMappings:
+        - DeviceName: /dev/xvda
+          Ebs:
+            VolumeSize: !Ref VolumeSize
+            VolumeType: gp2
+            DeleteOnTermination: true
+      UserData:
+        'Fn::Base64':
+          !Sub |
+            #!/bin/bash -x
+
+            #CFN Functions
+
+            function cfn_fail
+
+            {
+
+            cfn-signal -e 1 --stack ${AWS::StackName} --region ${AWS::Region} --resource ArtifactoryScalingGroup
+
+            exit 1
+
+            }
+
+            function cfn_success
+
+            {
+
+            cfn-signal -e 0 --stack ${AWS::StackName} --region ${AWS::Region} --resource ArtifactoryScalingGroup
+
+            exit 0
+
+            }
+
+            S3URI=${QsS3Uri}
+
+            # yum install -y git
+
+            echo $PATH
+
+            PATH=/opt/aws/bin:$PATH
+
+            echo $PATH
+            echo \'[Cloning: Load QuickStart Common Utils]\'
+
+            # git clone https://github.com/aws-quickstart/quickstart-linux-utilities.git
+
+            source /quickstart-linux-utilities/quickstart-cfn-tools.source
+
+            echo \'[Loaded: Load QuickStart Common Utils]\'
+
+            echo \'[Update Operating System]\'
+
+            qs_update-os || qs_err
+
+            qs_bootstrap_pip || qs_err
+
+            qs_aws-cfn-bootstrap || qs_err
+
+            source ~/venv/bin/activate &> /var/log/userdata.activate_venv.log || qs_err " activate venv failed "
+
+            # CentOS cloned virtual machines do not create a new machine id
+            # https://www.thegeekdiary.com/centos-rhel-7-how-to-change-the-machine-id/
+            rm -f /etc/machine-id
+            systemd-machine-id-setup
+
+            # mkdir ~/.artifactory_ansible
+
+            # aws s3 --region ${AWS::Region} sync s3://${QsS3BucketName}/${QsS3KeyPrefix}cloudInstallerScripts/ ~/.artifactory_ansible/
+
+            cfn-init -v --stack ${AWS::StackName} --resource ArtifactoryLaunchConfiguration --configsets artifactory_install --region ${AWS::Region} || cfn_fail
+
+            export ANSIBLE_VAULT_PASSWORD_FILE="/root/.vault_pass.txt"
+
+            setsebool httpd_can_network_connect 1 -P
+
+            ansible-playbook /root/.jfrog_ami/artifactory.yml || qs_err " ansible execution failed "
+
+            rm -rf /root/.secureit.sh
+
+            [ $(qs_status) == 0 ] && cfn_success || cfn_fail
--- a/Amazon/Marketplace/v7106/templates/jfrog-artifactory-ec2-marketplace-master.template.yaml
+++ b/Amazon/Marketplace/v7106/templates/jfrog-artifactory-ec2-marketplace-master.template.yaml
@@ -0,0 +1,457 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Description: 'JFrog Artifactory Quick Start Deployment (qs-1qpmmjh2f)'
+Metadata:
+  QuickStartDocumentation:
+    EntrypointName: "Launch into a new VPC"
+  AWS::CloudFormation::Interface:
+    ParameterGroups:
+      - Label:
+          default: Security configuration
+        Parameters:
+          - KeyPairName
+          - AccessCidr
+          - RemoteAccessCidr
+      - Label:
+          default: Network configuration
+        Parameters:
+          - PrivateSubnet1Cidr
+          - PrivateSubnet2Cidr
+          - VpcId
+          - VpcCidr
+          - PublicSubnet1Id
+          - PublicSubnet2Id
+          - PrivateSubnet1Id
+          - PrivateSubnet2Id
+      - Label:
+          default: Amazon EC2 configuration
+        Parameters:
+          - VolumeSize
+          - InstanceType
+      - Label:
+          default: JFrog Artifactory configuration
+        Parameters:
+          - ArtifactoryVersion
+          - NumberOfSecondary
+          - SmLicenseCertName
+          - ArtifactoryServerName
+          - MasterKey
+          - ExtraJavaOptions
+          - DefaultJavaMemSettings
+          - KeystorePassword
+          - AnsibleVaultPass
+      - Label:
+          default: Amazon RDS configuration
+        Parameters:
+          - DatabaseName
+          - DatabaseEngine
+          - DatabaseUser
+          - DatabasePassword
+          - DatabaseInstance
+          - DatabaseAllocatedStorage
+          - MultiAzDatabase
+      - Label:
+          default: JFrog Xray Configuration
+        Parameters:
+          - InstallXray
+          - XrayVersion
+          - XrayNumberOfInstances
+          - XrayInstanceType
+          - XrayDatabaseUser
+          - XrayDatabasePassword
+    ParameterLabels:
+      KeyPairName:
+        default: SSH key name
+      PrivateSubnet1Cidr:
+        default: Private subnet 1 CIDR
+      PrivateSubnet2Cidr:
+        default: Private subnet 2 CIDR
+      AccessCidr:
+        default: Permitted IP range
+      RemoteAccessCidr:
+        default: Remote access CIDR
+      VpcId:
+        default: VPC ID
+      VpcCidr:
+        default: VPC CIDR
+      PublicSubnet1Id:
+        default: Public subnet 1 ID
+      PublicSubnet2Id:
+        default: Public subnet 2 ID
+      PrivateSubnet1Id:
+        default: Private subnet 1 ID
+      PrivateSubnet2Id:
+        default: Private subnet 2 ID
+      VolumeSize:
+        default: EBS root volume size
+      InstanceType:
+        default: EC2 instance type
+      NumberOfSecondary:
+        default: Secondary instances
+      ArtifactoryVersion:
+        default: Artifactory version
+      SmLicenseCertName:
+        default: Artifactory licenses and certificate secret name
+      ArtifactoryServerName:
+        default: Artifactory server name
+      MasterKey:
+        default: Master server key
+      ExtraJavaOptions:
+        default: Extra Java options
+      DefaultJavaMemSettings:
+        default: Default Java memory settings
+      KeystorePassword:
+        default: Java key store password
+      AnsibleVaultPass:
+        default: Ansible Vault password
+      DatabaseName:
+        default: Database name
+      DatabaseEngine:
+        default: Database engine
+      DatabaseUser:
+        default: Database user
+      DatabasePassword:
+        default: Database password
+      DatabaseInstance:
+        default: Database instance type
+      DatabaseAllocatedStorage:
+        default: Database allocated storage
+      MultiAzDatabase:
+        default: High-availability database
+      InstallXray:
+        default: Install JFrog Xray
+      XrayVersion:
+        default: Version of Xray to install
+      XrayNumberOfInstances:
+        default: Number of JFrog XrayNumberOfInstances
+      XrayInstanceType:
+        default: Xray instance type
+      XrayDatabaseUser:
+        default: Xray Database user
+      XrayDatabasePassword:
+        default: Xray Database password
+Parameters:
+  VpcId:
+    Description: ID of your existing VPC (e.g., vpc-0343606e).
+    Type: "AWS::EC2::VPC::Id"
+  VpcCidr:
+    Description: CIDR block for the VPC.
+    AllowedPattern: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(1[6-9]|2[0-8]))$
+    ConstraintDescription: CIDR block parameter must be in the form x.x.x.x/16-28
+    Default: 10.0.0.0/16
+    Type: String
+  PublicSubnet1Id:
+    Description: ID of the public subnet in Availability Zone 1 of your existing VPC (e.g., subnet-z0376dab).
+    Type: "AWS::EC2::Subnet::Id"
+  PublicSubnet2Id:
+    Description: ID of the public subnet in Availability Zone 2 of your existing VPC (e.g., subnet-a29c3d84).
+    Type: "AWS::EC2::Subnet::Id"
+  PrivateSubnet1Id:
+    Description: ID of the private subnet in Availability Zone 1 of your existing VPC (e.g., subnet-a0246dcd).
+    Type: "AWS::EC2::Subnet::Id"
+  PrivateSubnet2Id:
+    Description: ID of the private subnet in Availability Zone 2 of your existing VPC (e.g., subnet-b58c3d67).
+    Type: "AWS::EC2::Subnet::Id"
+  KeyPairName:
+    Description: Name of an existing key pair,
+      which allows you to connect securely to your instance after it launches.
+      This is the key pair you created in your preferred Region.
+    Type: AWS::EC2::KeyPair::KeyName
+  PrivateSubnet1Cidr:
+    Description: CIDR block for private subnet 1, located in Availability Zone 1.
+    AllowedPattern: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(1[6-9]|2[0-8]))$
+    ConstraintDescription: CIDR block parameter must be in the form x.x.x.x/16-28
+    Default: 10.0.0.0/19
+    Type: String
+  PrivateSubnet2Cidr:
+    Description: CIDR block for private subnet 2, located in Availability Zone 2.
+    AllowedPattern: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(1[6-9]|2[0-8]))$
+    ConstraintDescription: CIDR block parameter must be in the form x.x.x.x/16-28
+    Default: 10.0.32.0/19
+    Type: String
+  AccessCidr:
+    Description: CIDR IP range permitted to access Artifactory.
+      It is recommended that you set this value to a trusted IP range.
+      For example, you may want to limit software access to your corporate network.
+    AllowedPattern: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/([0-9]|[1-2][0-9]|3[0-2]))$
+    Type: String
+  RemoteAccessCidr:
+    Description: Remote CIDR range that allows you to connect to the bastion instance by using SSH.
+      It is recommended that you set this value to a trusted IP range.
+      For example, you may want to grant specific ranges from within your corporate network that use the SSH protocol.
+    AllowedPattern: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/([0-9]|[1-2][0-9]|3[0-2]))$
+    Type: String
+  VolumeSize:
+    Description: Size in gigabytes of available storage (min 10GB). The Quick Start creates an
+      Amazon Elastic Block Store (Amazon EBS) volumes of this size.
+    Default: 200
+    Type: Number
+  InstanceType:
+    Description: EC2 type for the Artifactory instances.
+    AllowedValues:
+      - m5.large
+      - m5.xlarge
+      - m5.2xlarge
+      - m5.4xlarge
+      - m5.8xlarge
+      - m5.12xlarge
+      - m5.16xlarge
+      - m5.24xlarge
+      - m5.metal
+      - m5d.large
+      - m5d.xlarge
+      - m5d.2xlarge
+      - m5d.4xlarge
+      - m5d.8xlarge
+      - m5d.12xlarge
+      - m5d.16xlarge
+      - m5d.24xlarge
+      - m5d.metal
+      - m5a.large
+      - m5a.xlarge
+      - m5a.2xlarge
+      - m5a.4xlarge
+      - m5a.8xlarge
+      - m5a.12xlarge
+      - m5a.16xlarge
+      - m5a.24xlarge
+    ConstraintDescription: Must contain valid instance type.
+    Default: m5.xlarge
+    Type: String
+  NumberOfSecondary:
+    Description: Number of secondary Artifactory servers to complete your
+      HA deployment. To align with Artifactory best practices, the minimum number
+      is two, and the maximum is seven. Do not select more instances than you
+      have licenses for.
+    AllowedValues:
+      - 0
+      - 1
+      - 2
+      - 3
+      - 4
+      - 5
+      - 6
+      - 7
+    Default: 2
+    Type: Number
+  ArtifactoryVersion:
+    Description: Version of Artifactory that you want to deploy into the Quick Start.
+      To select the correct version, see the release notes at
+      https://www.jfrog.com/confluence/display/RTF/Release+Notes.
+    AllowedPattern: ^(([0-9]|[1-9][0-9])\.){2}([1-9][0-9]|[0-9])$
+    ConstraintDescription: A version that matches X.X.X per Artifactory releases.
+    Default: 7.10.6
+    Type: String
+  SmLicenseCertName:
+    Description: Secret name created in AWS Secrets Manager that contains the SSL certificate, certificate key, and Artifactory licenses.
+    Default: ''
+    Type: String
+  ArtifactoryServerName:
+    Description: Name of your Artifactory server. Ensure that this matches your certificate.
+    Type: String
+  MasterKey:
+    Description: Master key for the Artifactory cluster. Generate a master key by using the command '$openssl rand -hex 16'.
+    AllowedPattern: ^[a-zA-Z0-9]+$
+    MinLength: '1'
+    MaxLength: '64'
+    ConstraintDescription: Only capital or lowercase letters and numbers, with a Max of 64 characters.
+    NoEcho: 'true'
+    Type: String
+  ExtraJavaOptions:
+    Description: Set Java options to pass to the JVM for Artifactory. For more information, see the Artifactory
+      system requirements at https://www.jfrog.com/confluence/display/RTF/System+Requirements#SystemRequirements-RecommendedHardware.
+      Do not add Xms or Xmx settings without disabling DefaultJavaMemSettings.
+    Default: -Xss256k -XX:+UseG1GC
+    Type: String
+  DefaultJavaMemSettings:
+    Description: Choose false to overwrite the standard memory-calculation options to pass to the Artifactory JVM.
+      If you plan to overwrite them, ensure they are added to the ExtraJavaOptions to prevent the stack provision from failing.
+    ConstraintDescription: True or False
+    AllowedValues:
+      - "true"
+      - "false"
+    Default: "true"
+    Type: String
+  KeystorePassword:
+    Description: Java key store password. For better security, the password that you specify will
+      replace the default Java key store password.
+    NoEcho: 'true'
+    Type: String
+  AnsibleVaultPass:
+    Description: Ansible Vault password to protect the Artifactory YAML configuration file
+      generated during the Artifactory deployment. This YAML file is stored on the EC2 nodes
+      and secured with this password.
+    NoEcho: 'true'
+    Type: String
+  DatabaseName:
+    Description: Name of your database instance. The name must be unique across all instances
+      owned by your AWS account in the current Region. The database instance identifier is case-insensitive,
+      but it's stored in lowercase (as in "mydbinstance").
+    AllowedPattern: ^[a-zA-Z]([a-zA-Z0-9])+$
+    MinLength: '1'
+    MaxLength: '60'
+    ConstraintDescription: 1 to 60 alphanumeric characters First character must be a letter.
+    Default: artdb
+    Type: String
+  DatabaseEngine:
+    Description: Database engine that you want to run.
+    AllowedValues:
+      - Postgres
+    Default: Postgres
+    Type: String
+  DatabaseUser:
+    Description: Login ID for the master user of your database instance.
+    MinLength: '1'
+    MaxLength: '16'
+    AllowedPattern: ^[a-zA-Z]([a-zA-Z0-9])+$
+    ConstraintDescription: 1 to 16 alphanumeric characters. The first character must be a letter.
+    Default: artifactory
+    Type: String
+  DatabasePassword:
+    Description: Password for the Artifactory database user.
+    AllowedPattern: ^[^ \\']+$
+    MinLength: '8'
+    MaxLength: '12'
+    ConstraintDescription: Must be at least 8 and no more than
+      12 characters containing letters and (minimum 1 capital letter), numbers and
+      symbols.
+    NoEcho: 'true'
+    Type: String
+  DatabaseInstance:
+    Description: Size of the database to be deployed as part of the Quick Start.
+    AllowedValues:
+      - db.m5.large
+      - db.m5.xlarge
+      - db.m5.2xlarge
+      - db.m5.10xlarge
+      - db.m5.16xlarge
+      - db.m5.large
+      - db.m5.xlarge
+      - db.m5.2xlarge
+      - db.m5.4xlarge
+      - db.m5.12xlarge
+      - db.m5.24xlarge
+    ConstraintDescription: Must be a valid database Instance Type.
+    Default: db.m5.large
+    Type: String
+  DatabaseAllocatedStorage:
+    Description: Size in gigabytes of available storage for the database instance.
+    MinValue: 5
+    MaxValue: 1024
+    Default: 10
+    Type: Number
+  MultiAzDatabase:
+    Description: Choose false to create an Amazon RDS instance in a single Availability Zone.
+    ConstraintDescription: True or False
+    AllowedValues:
+      - "true"
+      - "false"
+    Default: "true"
+    Type: String
+  InstallXray:
+    Description: Choose true to install JFrog Xray instance(s).
+    ConstraintDescription: True or False
+    AllowedValues:
+      - "true"
+      - "false"
+    Default: "true"
+    Type: String
+  XrayVersion:
+    Description: The version of Xray that you want to deploy into the Quick Start.
+    AllowedPattern: ^(([0-9]|[1-9][0-9])\.){2}([1-9][0-9]|[0-9])$
+    ConstraintDescription: A version that matches X.X.X per Xray releases.
+    Default: 3.11.2
+    Type: String
+  XrayNumberOfInstances:
+    Description: The number of Xray instances servers to complete your
+      HA deployment. The minimum number is one; the maximum is seven.
+      Do not select more than instances than you have licenses for.
+    MinValue: 1
+    MaxValue: 7
+    Default: 1
+    Type: Number
+  XrayInstanceType:
+    Description: The EC2 instance type for the Xray instances.
+    AllowedValues:
+      - c5.2xlarge
+      - c5.4xlarge
+    ConstraintDescription: Must contain valid instance type.
+    Default: c5.2xlarge
+    Type: String
+  XrayDatabaseUser:
+    Description: The login ID for the Xray database user.
+    MinLength: '1'
+    MaxLength: '16'
+    AllowedPattern: ^[a-zA-Z]([a-zA-Z0-9])+$
+    ConstraintDescription: 1 to 16 alphanumeric characters. First character must be a letter.
+    Default: xray
+    Type: String
+  XrayDatabasePassword:
+    Description: The password for the Xray database user.
+    AllowedPattern: ^[^ \\']+$
+    MinLength: '8'
+    MaxLength: '12'
+    ConstraintDescription: Must be at least 8 and no more than
+      12 characters containing letters and (minimum 1 capital letter), numbers and
+      symbols.
+    NoEcho: 'true'
+    Type: String
+Resources:
+  ArtifactoryExistingVpcStack:
+    Type: AWS::CloudFormation::Stack
+    Properties:
+      TemplateURL: !Sub https://jfrog-aws-test.s3.us-east-1.${AWS::URLSuffix}/artifactory7/v7106/templates/jfrog-artifactory-ec2-existing-vpc.template.yaml
+      # TemplateURL: !Sub https://${QsS3BucketName}.s3.${QsS3BucketRegion}.${AWS::URLSuffix}/${QsS3KeyPrefix}templates/jfrog-artifactory-ec2-existing-vpc.template.yaml
+      Parameters:
+        KeyPairName: !Ref KeyPairName
+        VpcId: !Ref VpcId
+        VpcCidr: !Ref VpcCidr
+        PublicSubnet1Id: !Ref PublicSubnet1Id
+        PublicSubnet2Id: !Ref PublicSubnet2Id
+        PrivateSubnet1Id: !Ref PrivateSubnet1Id
+        PrivateSubnet2Id: !Ref PrivateSubnet2Id
+        PrivateSubnet1Cidr: !Ref PrivateSubnet1Cidr
+        PrivateSubnet2Cidr: !Ref PrivateSubnet2Cidr
+        AccessCidr: !Ref AccessCidr
+        RemoteAccessCidr: !Ref RemoteAccessCidr
+        ProvisionBastionHost: "Disabled"
+        BastionInstanceType: "t3.micro"
+        BastionRootVolumeSize: 10
+        BastionEnableTcpForwarding: "true"
+        BastionEnableX11Forwarding: "false"
+        BastionOs: "Amazon-Linux2-HVM"
+        NumBastionHosts: "1"
+        VolumeSize: !Ref VolumeSize
+        InstanceType: !Ref InstanceType
+        NumberOfSecondary: !Ref NumberOfSecondary
+        ArtifactoryProduct: "JFrog-Artifactory-Pro"
+        ArtifactoryVersion: !Ref ArtifactoryVersion
+        SmLicenseCertName: !Ref SmLicenseCertName
+        ArtifactoryServerName: !Ref ArtifactoryServerName
+        MasterKey: !Ref MasterKey
+        ExtraJavaOptions: !Ref ExtraJavaOptions
+        DefaultJavaMemSettings: !Ref DefaultJavaMemSettings
+        KeystorePassword: !Ref KeystorePassword
+        AnsibleVaultPass: !Ref AnsibleVaultPass
+        DatabaseName: !Ref DatabaseName
+        DatabaseEngine: !Ref DatabaseEngine
+        DatabaseUser: !Ref DatabaseUser
+        DatabasePassword: !Ref DatabasePassword
+        DatabaseInstance: !Ref DatabaseInstance
+        DatabaseAllocatedStorage: !Ref DatabaseAllocatedStorage
+        MultiAzDatabase: !Ref MultiAzDatabase
+        QsS3BucketName: "jfrog-aws-test"
+        QsS3KeyPrefix: "artifactory7/v7106/"
+        QsS3BucketRegion: "us-east-1"
+        InstallXray: !Ref InstallXray
+        XrayVersion: !Ref XrayVersion
+        XrayNumberOfInstances: !Ref XrayNumberOfInstances
+        XrayInstanceType: !Ref XrayInstanceType
+        XrayDatabaseUser: !Ref XrayDatabaseUser
+        XrayDatabasePassword: !Ref XrayDatabasePassword
+Outputs:
+  ArtifactoryUrl:
+    Description: URL of the ELB to access Artifactory
+    Value: !Sub ${ArtifactoryExistingVpcStack.Outputs.ArtifactoryUrl}
+  BastionIp:
+    Value: !Sub ${ArtifactoryExistingVpcStack.Outputs.BastionIp}
+    Description: Bastion host IP, for admin access via SSH
--- a/Amazon/Marketplace/v7106/templates/jfrog-xray-ec2-instance.template.yaml
+++ b/Amazon/Marketplace/v7106/templates/jfrog-xray-ec2-instance.template.yaml
@@ -0,0 +1,283 @@
+AWSTemplateFormatVersion: "2010-09-09"
+Description: "Deploys the EC2 Autoscaling, LaunchConfig and Instance for Xray"
+Parameters:
+  PrivateSubnet1Id:
+    Type: 'AWS::EC2::Subnet::Id'
+  PrivateSubnet2Id:
+    Type: 'AWS::EC2::Subnet::Id'
+  KeyPairName:
+    Type: AWS::EC2::KeyPair::KeyName
+  MinScalingNodes:
+    Type: Number
+  MaxScalingNodes:
+    Type: Number
+  DeploymentTag:
+    Type: String
+  QsS3BucketName:
+    Type: String
+  QsS3KeyPrefix:
+    Type: String
+  QsS3Uri:
+    Type: String
+  DatabaseDriver:
+    Type: String
+  DatabaseType:
+    Type: String
+  DatabaseUser:
+    Type: String
+  DatabasePassword:
+    Type: String
+    NoEcho: 'true'
+  MasterKey:
+    Type: String
+    NoEcho: 'true'
+  SecurityGroups:
+    Type: String
+  VolumeSize:
+    Type: Number
+  XrayHostProfile:
+    Type: String
+  XrayHostRole:
+    Type: String
+  XrayInstanceType:
+    Type: String
+  JfrogInternalUrl:
+    Type: String
+  AnsibleVaultPass:
+    Description: Ansiblevault Password to secure the artifactory.yml
+    Type: String
+    NoEcho: 'true'
+  XrayDatabaseUser:
+    Type: String
+  XrayDatabasePassword:
+    Type: String
+    NoEcho: 'true'
+  XrayMasterDatabaseUrl:
+    Type: String
+  XrayDatabaseUrl:
+    Type: String
+  XrayFirstNode:
+    Description: Runs database scripts if this is the first node
+    Type: String
+  XrayVersion:
+    Type: String
+  XrayAmiId:
+    Type: String
+# To populate additional mappings use the following with the desired --region
+# aws --region us-west-2 ec2 describe-images --owners amazon --filters 'Name=name,Values=amzn-ami-hvm-2018.03.0.20181129-x86_64-gp2' 'Name=state,Values=available' --output json | jq -r '.Images | sort_by(.CreationDate) | last(.[]).ImageId'
+Mappings:
+  AWSAMIRegionMap:
+    ap-northeast-1:
+      "330": ami-09dfb20a591375d09 # TODO: Get correct ami - provided by market place tem
+      "361": ami-09dfb20a591375d09 # TODO: Get correct ami - provided by market place tem
+    ap-northeast-2:
+      "330": ami-0eb86b82de93a34fb # TODO: Get correct ami - provided by market place tem
+      "361": ami-0eb86b82de93a34fb # TODO: Get correct ami - provided by market place tem
+    ap-south-1:
+      "330": ami-01b828aa6cc99a322 # TODO: Get correct ami - provided by market place tem
+      "361": ami-01b828aa6cc99a322 # TODO: Get correct ami - provided by market place tem
+    ap-southeast-1:
+      "330": ami-04a94cc4dc0d08c98 # TODO: Get correct ami - provided by market place tem
+      "361": ami-04a94cc4dc0d08c98 # TODO: Get correct ami - provided by market place tem
+    ap-southeast-2:
+      "330": ami-030871aa8d1f0689e # TODO: Get correct ami - provided by market place tem
+      "361": ami-030871aa8d1f0689e # TODO: Get correct ami - provided by market place tem
+    ca-central-1:
+      "330": ami-0148cebea7bea4aaf # TODO: Get correct ami - provided by market place tem
+      "361": ami-0148cebea7bea4aaf # TODO: Get correct ami - provided by market place tem
+    eu-central-1:
+      "330": ami-07961f7c210143a42 # TODO: Get correct ami - provided by market place tem
+      "361": ami-07961f7c210143a42 # TODO: Get correct ami - provided by market place tem
+    eu-west-1:
+      "330": ami-0171b8d46941b4ca1 # TODO: Get correct ami - provided by market place tem
+      "361": ami-0171b8d46941b4ca1 # TODO: Get correct ami - provided by market place tem
+    sa-east-1:
+      "330": ami-0596f196b273bb8a6 # TODO: Get correct ami - provided by market place tem
+      "361": ami-0596f196b273bb8a6 # TODO: Get correct ami - provided by market place tem
+    us-east-1:
+      "330" : ami-0d4d4252cdc2b6f11 # TODO: Get correct ami - provided by market place tem
+      "361" : ami-086fcbf4aa2bd203f # TODO: Get correct ami - provided by market place tem
+      "386" : ami-0becff949aa530956 # partnership account + seller account
+      "3103": ami-07414bc0b35a8a896	# partnership account (shared with partnership account)
+      "3112": ami-0819678d7216af530	# seller account (shared with partnership account)
+    us-east-2:
+      "330" : ami-00a5fcde44618d39b # TODO: Get correct ami - using ami generated by myself - provided by market place tem
+      "361" : ami-005b2ceceac6999ff # TODO: Get correct ami - using ami generated by myself - provided by market place tem
+      "3103": ami-0568749cd3090ebd4	# partnership account (shared with partnership account)
+      "3112": ami-0819678d7216af530	# to be updated by Marketplace team
+    us-west-1:
+      "330" : ami-068cd684b4d3a3a86 # TODO: Get correct ami - provided by market place tem
+      "361" : ami-068cd684b4d3a3a86 # TODO: Get correct ami - provided by market place tem
+      "3103": ami-063b22c527b48e209	# partnership account (shared with partnership account)
+    us-west-2:
+      "330" : ami-03d60da4c8a146a55 # TODO: Get correct ami - provided by market place tem
+      "361" : ami-03d60da4c8a146a55 # TODO: Get correct ami - provided by market place tem
+      "386" : ami-07af1682f09ef4a20 # partnership account + seller account
+      "3103": ami-081aabd2bb46b1ffc	# partnership account (shared with partnership account)
+      "3112": ami-0819678d7216af530	# to be updated by Marketplace team
+    us-gov-east-1:
+      "361" : ami-001d5cec1e7399f65 # TODO: Get correct ami - provided by market place tem
+      "3103": ami-08ac98f47eb27e2a0 # partnership account
+      "3112": ami-0819678d7216af530	# to be updated by Marketplace team
+    us-gov-west-1:
+      "361" : ami-0eb4eecce8d5bcb80 # TODO: Get correct ami - provided by market place tem
+      "3103": ami-0cb5c0773d037b57b # partnership account
+      "3112": ami-0819678d7216af530	# to be updated by Marketplace team
+
+Resources:
+  XrayScalingGroup:
+    Type: 'AWS::AutoScaling::AutoScalingGroup'
+    Properties:
+      LaunchConfigurationName: !Ref XrayLaunchConfiguration
+      VPCZoneIdentifier:
+        - !Ref PrivateSubnet1Id
+        - !Ref PrivateSubnet2Id
+      MinSize: !Ref MinScalingNodes
+      MaxSize: !Ref MaxScalingNodes
+      Cooldown: '300'
+      DesiredCapacity: !Ref MinScalingNodes
+      HealthCheckType: EC2
+      HealthCheckGracePeriod: 900
+      Tags:
+        - Key: Name
+          Value: !Ref DeploymentTag
+          PropagateAtLaunch: true
+    CreationPolicy:
+      ResourceSignal:
+        Count: 1
+        Timeout: PT60M
+  XrayLaunchConfiguration:
+    Type: 'AWS::AutoScaling::LaunchConfiguration'
+    Metadata:
+      'AWS::CloudFormation::Authentication':
+        S3AccessCreds:
+          type: S3
+          roleName:
+            - !Ref XrayHostRole
+          buckets:
+            - !Ref QsS3BucketName
+      'AWS::CloudFormation::Init':
+        configSets:
+          xray_install:
+            - "config-xray"
+        config-xray:
+          files:
+            /root/.xray_ami/xray.yml:
+              content: !Sub
+                - |
+                  # Base install for Xray
+                  - import_playbook: site-xray.yml
+                    vars:
+                      jfrog_url: ${JfrogInternalUrl}
+                      master_key: ${MasterKey}
+                      join_key: ${MasterKey}
+                      db_type: ${DatabaseType}
+                      db_driver: ${DatabaseDriver}
+                      db_url: postgres://${XrayDatabaseUrl}
+                      db_user: ${XrayDatabaseUser}
+                      db_password: ${XrayDatabasePassword}
+                      xray_version: ${XrayVersion}
+                - {
+                  product: Xray
+                }
+              mode: "0400"
+            /root/.vault_pass.txt:
+              content: !Sub |
+                ${AnsibleVaultPass}
+              mode: "0400"
+    Properties:
+      AssociatePublicIpAddress: false
+      KeyName: !Ref KeyPairName
+      IamInstanceProfile: !Ref XrayHostProfile
+      ImageId: !FindInMap
+        - AWSAMIRegionMap
+        - !Ref 'AWS::Region'
+        - !Ref XrayAmiId
+      SecurityGroups:
+        - !Ref SecurityGroups
+      InstanceType: !Ref XrayInstanceType
+      BlockDeviceMappings:
+        - DeviceName: /dev/xvda
+          Ebs:
+            VolumeSize: !Ref VolumeSize
+            VolumeType: gp2
+            DeleteOnTermination: true
+      UserData:
+        'Fn::Base64':
+          !Sub |
+            #!/bin/bash -x
+            exec > >(tee /var/log/user-data.log|logger -t user-data -s 2>/dev/console) 2>&1
+
+            #CFN Functions
+
+            function cfn_fail
+
+            {
+
+            cfn-signal -e 1 --stack ${AWS::StackName} --region ${AWS::Region} --resource XrayScalingGroup
+
+            exit 1
+
+            }
+
+            function cfn_success
+
+            {
+
+            cfn-signal -e 0 --stack ${AWS::StackName} --region ${AWS::Region} --resource XrayScalingGroup
+
+            exit 0
+
+            }
+
+            S3URI=${QsS3Uri}
+
+            # yum install -y git
+
+            echo $PATH
+
+            PATH=/opt/aws/bin:$PATH
+
+            echo $PATH
+            echo \'[Cloning: Load QuickStart Common Utils]\'
+
+            # git clone https://github.com/aws-quickstart/quickstart-linux-utilities.git
+
+            source /quickstart-linux-utilities/quickstart-cfn-tools.source
+
+            echo \'[Loaded: Load QuickStart Common Utils]\'
+
+            echo \'[Update Operating System]\'
+
+            qs_update-os || qs_err
+
+            qs_bootstrap_pip || qs_err
+
+            qs_aws-cfn-bootstrap || qs_err
+
+            source ~/venv/bin/activate &> /var/log/userdata.activate_venv.log || qs_err " activate venv failed "
+
+            # mkdir ~/.xray_ansible
+
+            # aws s3 --region ${AWS::Region} sync s3://${QsS3BucketName}/${QsS3KeyPrefix}cloudInstallerScripts/ ~/.xray_ansible/
+
+            cfn-init -v --stack ${AWS::StackName} --resource XrayLaunchConfiguration --configsets xray_install --region ${AWS::Region} || cfn_fail
+
+            # CentOS cloned virtual machines do not create a new machine id
+            # https://www.thegeekdiary.com/centos-rhel-7-how-to-change-the-machine-id/
+            rm -f /etc/machine-id
+            systemd-machine-id-setup
+
+            if "true" == "${XrayFirstNode}"
+            then
+                psql postgresql://${DatabaseUser}:${DatabasePassword}@${XrayMasterDatabaseUrl} -c "CREATE USER ${XrayDatabaseUser} WITH PASSWORD '${XrayDatabasePassword}'" &>> /var/log/userdata.xray_database.log;
+                psql postgresql://${DatabaseUser}:${DatabasePassword}@${XrayMasterDatabaseUrl} -c "grant ${XrayDatabaseUser} to ${DatabaseUser}" &>> /var/log/userdata.xray_database.log;
+                psql postgresql://${DatabaseUser}:${DatabasePassword}@${XrayMasterDatabaseUrl} -c "CREATE DATABASE xraydb WITH OWNER=${XrayDatabaseUser} ENCODING='UTF8'" &>> /var/log/userdata.xray_database.log;
+                psql postgresql://${DatabaseUser}:${DatabasePassword}@${XrayMasterDatabaseUrl} -c "GRANT ALL PRIVILEGES ON DATABASE xraydb TO ${XrayDatabaseUser}" &>> /var/log/userdata.xray_database.log;
+            fi
+
+            ansible-playbook /root/.xray_ami/xray.yml || qs_err " ansible execution failed "
+
+            $(qs_status) &> /var/log/qs_status.log
+            cfn_success &> /var/log/cfn_success.log
+            [ $(qs_status) == 0 ] && cfn_success || cfn_fail