UPD: various changes

cloudformation/acrolinx-cftemplate.yaml

@@ -13,29 +13,33 @@ Parameters:
         Description: Timezone of instance
         Type: String
         Default: UTC
+
 Mappings:
     RegionMap:
-        us-west-1:
+        us-west-2:
             VpcId: vpc-7155ca14
             ImageId: ami-0a8d75344fec6c412
-          SshKey: AROLINX-OREGON
+            SshKey: ACROLINX-OREGON
-          SecGroups: ["sg-0c8c5cf4dca2147ee","sg-d444e4b2","sg-0b93187b","sg-859d16f5"]
-        eu-east-1:
-          VpcId:
-          ImageId: 
-          SshKey: AROLINX-IRELAND
             SecGroups: ["sg-0c8c5cf4dca2147ee","sg-d444e4b2","sg-0b93187b","sg-859d16f5"]
+            Subnet: "10.2.254.0/28"
+        eu-west-1:
+            VpcId: vpc-55a5a930
+            ImageId: ami-0385d2ff9f9c3706d
+            SshKey: ACROLINX-IRELAND
+            SecGroups: ["sg-07ffa804cbff134ed","sg-5217ce2e","sg-620ad31e","sg-aa0ed7d6"]
+	    Subnet: "10.1.254.0/28"
 
 Resources:
     InstanceSubnet:
         Type: AWS::EC2::Subnet
         Properties:
             VpcId: !FindInMap [RegionMap, !Ref "AWS::Region", VpcId]
-            CidrBlock: "10.2.253.0/28"
+            CidrBlock: !FindInMap [RegionMap, !Ref "AWS::Region", Subnet]
 
     Ec2Instance:
         Type: AWS::EC2::Instance
         Properties:
+	    IamInstanceProfile: AmazonSSMRoleForInstancesQuickSetup
             KeyName: !FindInMap [RegionMap, !Ref "AWS::Region", SshKey]
             InstanceType: !Ref InputInstanceType
             ImageId: !FindInMap [RegionMap, !Ref "AWS::Region", ImageId]
@@ -74,10 +78,8 @@ Resources:
         Properties:
             HostedZoneName: "acrolinx.cloud."
             Comment: DNS name for my instance.
-            Name: !Join ['origin-', [!Ref 'InputSubdomain', ".acrolinx.cloud"]]
+            Name: !Join ['', ['origin-', !Ref 'InputSubdomain', ".acrolinx.cloud"]]
             Type: A
             TTL: '900'
             ResourceRecords:
             - !Ref Ec2EIP
-
-