Skip to content

Commit

Permalink
Merge pull request #30 from gozer/stacks-versionning
Browse files Browse the repository at this point in the history
Add StacksVersion argument, helps along tinnightcap/nubis-stacks#41
  • Loading branch information
tinnightcap committed Jul 8, 2015
2 parents 20a541e + 2b94a25 commit bd77347
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions nubis/cloudformation/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@
"AmiId": {
"Description": "The id of the ami for this region",
"Type": "String"
},
"StacksVersion": {
"Description": "Version of the Nubis Stacks",
"Type": "String",
"Default": "master"
}
},
"Mappings": {
Expand All @@ -52,7 +57,7 @@
"EC2Stack": {
"Type": "AWS::CloudFormation::Stack",
"Properties": {
"TemplateURL": "https://s3.amazonaws.com/nubisproject-stacks/master/ec2.template",
"TemplateURL": { "Fn::Join": [ "/", [ "https://s3.amazonaws.com/nubisproject-stacks", { "Ref": "StacksVersion" }, "ec2.template" ] ] },
"TimeoutInMinutes": "60",
"Parameters": {
"StackName": {
Expand Down Expand Up @@ -94,7 +99,7 @@
"ELBStack": {
"Type": "AWS::CloudFormation::Stack",
"Properties": {
"TemplateURL": "https://s3.amazonaws.com/nubisproject-stacks/master/elb.template",
"TemplateURL": { "Fn::Join": [ "/", [ "https://s3.amazonaws.com/nubisproject-stacks", { "Ref": "StacksVersion" }, "elb.template" ] ] },
"TimeoutInMinutes": "60",
"Parameters": {
"ServiceName": {
Expand All @@ -113,7 +118,7 @@
"Route53Stack": {
"Type": "AWS::CloudFormation::Stack",
"Properties": {
"TemplateURL": "https://s3.amazonaws.com/nubisproject-stacks/master/route53.template",
"TemplateURL": { "Fn::Join": [ "/", [ "https://s3.amazonaws.com/nubisproject-stacks", { "Ref": "StacksVersion" }, "route53.template" ] ] },
"TimeoutInMinutes": "60",
"Parameters": {
"DNSName": {
Expand Down

0 comments on commit bd77347

Please sign in to comment.