Skip to content

Commit

Permalink
Merge pull request #441 from QualiSystems/develop
Browse files Browse the repository at this point in the history 
Merger dev to master for 2.2.0 release
  • Loading branch information
@alexazarh
alexazarh committed Feb 27, 2018
2 parents 0854708 + 5c571b6 commit fa1a73f
Show file tree
Hide file tree
Showing 27 changed files with 601 additions and 284 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ install:
- pip install mock
- pip install "cloudshell-core>=2.2.0,<2.3.0"
- pip install "cloudshell-shell-core>=3.1.0,<3.2.0"
- pip install "cloudshell-automation-api>=8.2.0.0,<8.2.1.0" --extra-index-url https://testpypi.python.org/simple
- pip install "cloudshell-automation-api>=8.3.0.0,<8.3.1.0" --extra-index-url https://testpypi.python.org/simple

script:
- pushd package
Expand Down
96 changes: 35 additions & 61 deletions cloudformation/0_Main.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,77 +3,40 @@
"Mappings": {
"AMIFromRegion": {
"us-east-1": {
"QualixAMI": "ami-6d1c2007",
"ESAMI": "ami-6d1c2007",
"NatAMI": "ami-4868ab25",
"QSAMI":"ami-5648ad2c"

"NatAMI": "ami-4868ab25"
},
"us-east-2": {
"QualixAMI": "ami-6a2d760f",
"ESAMI": "ami-6a2d760f",
"NatAMI": "ami-92a6fef7",
"QSAMI":"ami-d3e7c5b6"
"NatAMI": "ami-92a6fef7"
},
"eu-west-1": {
"QualixAMI": "ami-7abd0209",
"ESAMI": "ami-7abd0209",
"NatAMI": "ami-a8dd45db",
"QSAMI":"ami-e92fec90"
"NatAMI": "ami-a8dd45db"
},
"us-west-1": {
"QualixAMI": "ami-af4333cf",
"ESAMI": "ami-af4333cf",
"NatAMI": "ami-004b0f60",
"QSAMI":"ami-32320452"
"NatAMI": "ami-004b0f60"
},
"us-west-2": {
"QualixAMI": "ami-d2c924b2",
"ESAMI": "ami-d2c924b2",
"NatAMI": "ami-a275b1c2",
"QSAMI":"ami-47897a3f"
"NatAMI": "ami-a275b1c2"
},
"ap-south-1": {
"QualixAMI": "ami-95cda6fa",
"ESAMI": "ami-95cda6fa",
"NatAMI": "ami-e2b9d38d",
"QSAMI":"ami-6af0b705"
"NatAMI": "ami-e2b9d38d"
},
"ap-northeast-2": {
"QualixAMI": "ami-c74789a9",
"ESAMI": "ami-c74789a9",
"NatAMI": "ami-d14388bf",
"QSAMI":"ami-073be069"
"NatAMI": "ami-d14388bf"
},
"ap-southeast-1": {
"QualixAMI": "ami-f068a193",
"ESAMI": "ami-f068a193",
"NatAMI": "ami-a79b49c4",
"QSAMI":"ami-1c61147f"
"NatAMI": "ami-a79b49c4"
},
"ap-southeast-2": {
"QualixAMI": "ami-fedafc9d",
"ESAMI": "ami-fedafc9d",
"NatAMI": "ami-53371f30",
"QSAMI":"ami-663bdc04"
"NatAMI": "ami-53371f30"
},
"ap-northeast-1": {
"QualixAMI": "ami-eec1c380",
"ESAMI": "ami-eec1c380",
"NatAMI": "ami-2443b745",
"QSAMI":"ami-de8d40b8"
"NatAMI": "ami-2443b745"
},
"eu-central-1": {
"QualixAMI": "ami-9bf712f4",
"ESAMI": "ami-9bf712f4",
"NatAMI": "ami-5825cd37",
"QSAMI":"ami-29fd4b46"
"NatAMI": "ami-5825cd37"
},
"sa-east-1": {
"QualixAMI": "ami-26b93b4a",
"ESAMI": "ami-26b93b4a",
"NatAMI": "ami-9336bcff",
"QSAMI":"ami-1d364b71"
"NatAMI": "ami-9336bcff"
}
}
},
Expand Down Expand Up @@ -135,7 +98,7 @@
"Description": "Must be inside VPC CIDR",
"MinLength": "9",
"MaxLength": "18",
"Default": "10.0.0.16/28",
"Default": "10.0.0.32/28",
"AllowedPattern": "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/(\\d{1,2})",
"ConstraintDescription": "must be a valid IP CIDR range of the form x.x.x.x/x, inside VPC CIDR"
},
Expand Down Expand Up @@ -173,7 +136,20 @@
"NoEcho": true
}
},
"Conditions": {
"IsHighAvailabilityMode": {"Fn::Equals": [{"Ref": "9HighAvailabilityMode"}, "True"]}
},
"Resources": {
"AMILookup": {
"Type": "AWS::CloudFormation::Stack",
"Properties": {
"TemplateURL": "https://s3.amazonaws.com/cf-dynamic-execution-server/AMI_Lookup.json",
"Parameters": {
"LookupLatestWindowsServerAmi": "False",
"LookupLatestCentosAmi": "True"
}
}
},
"VPCNAT": {
"Type": "AWS::CloudFormation::Stack",
"Properties": {
Expand Down Expand Up @@ -210,7 +186,11 @@
"Fn::Select" : [ "0", { "Fn::GetAZs" : { "Ref" : "AWS::Region" } } ]
},
"AZ2": {
"Fn::Select" : [ "1", { "Fn::GetAZs" : { "Ref" : "AWS::Region" } } ]
"Fn::If" : [
"IsHighAvailabilityMode",
{"Fn::Select": [ "1", { "Fn::GetAZs" : { "Ref" : "AWS::Region" } } ]},
"NULL"
]
},
"HA": {
"Ref": "9HighAvailabilityMode"
Expand Down Expand Up @@ -258,18 +238,12 @@
"Outputs.SG2id"]
},
"QualixAMI": {
"Fn::FindInMap": ["AMIFromRegion",
{
"Ref": "AWS::Region"
},
"QualixAMI"]
"Fn::GetAtt": ["AMILookup",
"Outputs.CentosAMI"]
},
"ESAMI": {
"Fn::FindInMap": ["AMIFromRegion",
{
"Ref": "AWS::Region"
},
"ESAMI"]
"Fn::GetAtt": ["AMILookup",
"Outputs.CentosAMI"]
},
"KeyPair": {
"Ref": "7KeyPair"
Expand Down
94 changes: 34 additions & 60 deletions cloudformation/0_Main_EX.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,81 +89,57 @@
"Mappings": {
"AMIFromRegion": {
"us-east-1": {
"QualixAMI": "ami-6d1c2007",
"ESAMI": "ami-6d1c2007",
"NatAMI": "ami-4868ab25",
"QSAMI":"ami-5648ad2c"

"NatAMI": "ami-4868ab25"
},
"us-east-2": {
"QualixAMI": "ami-6a2d760f",
"ESAMI": "ami-6a2d760f",
"NatAMI": "ami-92a6fef7",
"QSAMI":"ami-d3e7c5b6"
"NatAMI": "ami-92a6fef7"
},
"eu-west-1": {
"QualixAMI": "ami-7abd0209",
"ESAMI": "ami-7abd0209",
"NatAMI": "ami-a8dd45db",
"QSAMI":"ami-e92fec90"
"NatAMI": "ami-a8dd45db"
},
"us-west-1": {
"QualixAMI": "ami-af4333cf",
"ESAMI": "ami-af4333cf",
"NatAMI": "ami-004b0f60",
"QSAMI":"ami-32320452"
"NatAMI": "ami-004b0f60"
},
"us-west-2": {
"QualixAMI": "ami-d2c924b2",
"ESAMI": "ami-d2c924b2",
"NatAMI": "ami-a275b1c2",
"QSAMI":"ami-47897a3f"
"NatAMI": "ami-a275b1c2"
},
"ap-south-1": {
"QualixAMI": "ami-95cda6fa",
"ESAMI": "ami-95cda6fa",
"NatAMI": "ami-e2b9d38d",
"QSAMI":"ami-6af0b705"
"NatAMI": "ami-e2b9d38d"
},
"ap-northeast-2": {
"QualixAMI": "ami-c74789a9",
"ESAMI": "ami-c74789a9",
"NatAMI": "ami-d14388bf",
"QSAMI":"ami-073be069"
"NatAMI": "ami-d14388bf"
},
"ap-southeast-1": {
"QualixAMI": "ami-f068a193",
"ESAMI": "ami-f068a193",
"NatAMI": "ami-a79b49c4",
"QSAMI":"ami-1c61147f"
"NatAMI": "ami-a79b49c4"
},
"ap-southeast-2": {
"QualixAMI": "ami-fedafc9d",
"ESAMI": "ami-fedafc9d",
"NatAMI": "ami-53371f30",
"QSAMI":"ami-663bdc04"
"NatAMI": "ami-53371f30"
},
"ap-northeast-1": {
"QualixAMI": "ami-eec1c380",
"ESAMI": "ami-eec1c380",
"NatAMI": "ami-2443b745",
"QSAMI":"ami-de8d40b8"
"NatAMI": "ami-2443b745"
},
"eu-central-1": {
"QualixAMI": "ami-9bf712f4",
"ESAMI": "ami-9bf712f4",
"NatAMI": "ami-5825cd37",
"QSAMI":"ami-29fd4b46"
"NatAMI": "ami-5825cd37"
},
"sa-east-1": {
"QualixAMI": "ami-26b93b4a",
"ESAMI": "ami-26b93b4a",
"NatAMI": "ami-9336bcff",
"QSAMI":"ami-1d364b71"
"NatAMI": "ami-9336bcff"
}
}
},
"Conditions": {
"IsHighAvailabilityMode": {"Fn::Equals": [{"Ref": "9HighAvailabilityMode"}, "True"]}
},
"Resources": {
"AMILookup": {
"Type": "AWS::CloudFormation::Stack",
"Properties": {
"TemplateURL": "https://s3.amazonaws.com/cf-dynamic-execution-server/AMI_Lookup.json",
"Parameters": {
"LookupLatestWindowsServerAmi": "False",
"LookupLatestCentosAmi": "True"
}
}
},
"VPCNAT": {
"Type": "AWS::CloudFormation::Stack",
"Properties": {
Expand Down Expand Up @@ -197,7 +173,11 @@
"Fn::Select" : [ "0", { "Fn::GetAZs" : { "Ref" : "AWS::Region" } } ]
},
"AZ2": {
"Fn::Select" : [ "1", { "Fn::GetAZs" : { "Ref" : "AWS::Region" } } ]
"Fn::If" : [
"IsHighAvailabilityMode",
{"Fn::Select": [ "1", { "Fn::GetAZs" : { "Ref" : "AWS::Region" } } ]},
"NULL"
]
},
"HA": {
"Ref": "9HighAvailabilityMode"
Expand Down Expand Up @@ -238,18 +218,12 @@
"Outputs.SG2id"]
},
"QualixAMI": {
"Fn::FindInMap": ["AMIFromRegion",
{
"Ref": "AWS::Region"
},
"QualixAMI"]
"Fn::GetAtt": ["AMILookup",
"Outputs.CentosAMI"]
},
"ESAMI": {
"Fn::FindInMap": ["AMIFromRegion",
{
"Ref": "AWS::Region"
},
"ESAMI"]
"Fn::GetAtt": ["AMILookup",
"Outputs.CentosAMI"]
},
"KeyPair": {
"Ref": "7KeyPair"
Expand Down

0 comments on commit fa1a73f

Please sign in to comment.