gantree 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 890bed9626d0352db659957aace15b0a9ea3f8bf
-  data.tar.gz: 6b972f89c7ddaf288d0ca33b69d70973cde45a27
+  metadata.gz: 38b556ec92f83ad61517d9e30778ee06c6a8b3c2
+  data.tar.gz: 25ad1a639842604005fd550b7a38c9d491f18534
 SHA512:
-  metadata.gz: 3ed0c4b291bbc0b76b2a5b9bac17a5b816640c68cac7139ea2217705fc6c4bac044f100db35385cb91341eb0e252158f3822168643b831e1f420d341781323d1
-  data.tar.gz: 55595e357a63d12e515048fde094a2089ff2d96bcb820d8256c0fc92cf3d35f5bf7ecac7f17fe303ecede792dfe6682d365acff2648c9438a7382f2ce1ffe487
+  metadata.gz: d2d8b7cc209df5ee1c97f3f4cf354922acf0fcabffb85911095211853eb950f5117ea53a0a2ebd05f3ff06f932e775858aa605e2be4ada505afd3995302eb425
+  data.tar.gz: daf36190d1034eea57ada9817dd4df28aa65ec590f8722b6a1d0e4708aec06a8fcb88131b9a9efa903a2117db9b595e4b8dfc52ab0d0ff601af4475cc02b67d2

data/.gitignore

@@ -14,3 +14,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+cfn/*

data/Gemfile

@@ -7,5 +7,4 @@ gem "guard", group: :test
 gem "rspec", group: :test
 gem "rake"
 gem "guard-rspec", require: false
-gem "webmock"
-gem "cloudformation-ruby-dsl"
+gem "webmock"

data/Gemfile.lock

@@ -9,14 +9,11 @@ GEM
       nokogiri (>= 1.4.4)
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    cloudformation-ruby-dsl (0.4.6)
-      detabulator
     codeclimate-test-reporter (0.4.0)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    detabulator (0.1.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
     ffi (1.9.3)
@@ -79,7 +76,6 @@ PLATFORMS
 
 DEPENDENCIES
   aws-sdk
-  cloudformation-ruby-dsl
   codeclimate-test-reporter
   guard
   guard-rspec

data/gantree.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "aws-sdk"
   spec.add_dependency "hashie"
   spec.add_dependency "colorize"
+  spec.add_dependency "rubyzip"
+  spec.add_dependency "cloudformation-ruby-dsl"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/gantree/cfn.rb

@@ -10,6 +10,7 @@ module Gantree
         :access_key_id => ENV['AWS_ACCESS_KEY_ID'],
         :secret_access_key => ENV['AWS_SECRET_ACCES_KEY'])
       @s3 = AWS::S3.new
+      @cfm = AWS::CloudFormation.new
       @requirements = "#!/usr/bin/env ruby
         require 'bundler/setup'
         require 'cloudformation-ruby-dsl/cfntemplate'
@@ -21,7 +22,9 @@ module Gantree
         stack_name: @stack_name,
         requirements: @requirements,
         cfn_bucket: "br-templates",
-        env: @env
+        env: @env,
+        stag_domain: "sbleacherreport.com",
+        prod_domain: "bleacherreport.com"
       }
     end
 
@@ -29,13 +32,14 @@ module Gantree
       generate("master", MasterTemplate.new(@params).create)
       generate("beanstalk", BeanstalkTemplate.new(@params).create)
       generate("resources", ResourcesTemplate.new(@params).create)
+      create_aws_cfn_stack
     end
 
     def generate(template_name, template)
       IO.write("cfn/#{template_name}.rb", template)
       json = `ruby cfn/#{template_name}.rb expand`
       Dir.mkdir 'cfn' rescue Errno::ENOENT
-      template_file_name = "#{@params[:env]}-#{template_name}.cfn.json"
+      template_file_name = "#{@env}-#{template_name}.cfn.json"
       IO.write("cfn/#{template_file_name}", json)
       puts "Created #{template_file_name} in the cfn directory"
       FileUtils.rm("cfn/#{template_name}.rb")
@@ -58,8 +62,8 @@ module Gantree
 
     def create_aws_cfn_stack
       puts "Creating stack on aws..."
-      cfm = AWS::CloudFormation.new
-      stack = cfm.stacks.create(stack_name, template)
+      template = AWS::S3.new.buckets["#{@params[:cfn_bucket]}/#{@env}"].objects["#{@env}-master.cfn.json"]
+      stack = @cfm.stacks.create(@params[:stack_name], template,{ :disable_rollback => true })
     end
 
   end

data/lib/gantree/cfn/beanstalk.rb

@@ -3,6 +3,8 @@ class BeanstalkTemplate
   def initialize params
     @stack_name = params[:stack_name]
     @env = params[:env]
+    @prod_domain = params[:prod_domain]
+    @stag_domain = params[:stag_domain]
     @requirements = params[:requirements]
   end
 
@@ -19,8 +21,8 @@ class BeanstalkTemplate
               :prod => { :name => 'production' }
 
       mapping 'HostedZoneName',
-              :stag => { :name => 'sbleacherreport.com' },
-              :prod => { :name => 'bleacherreport.com' }
+              :stag => { :name => '#{@stag_domain}' },
+              :prod => { :name => '#{@prod_domain}' }
 
       parameter 'KeyName',
                 :Description => 'The Key Pair to launch instances with',
@@ -39,26 +41,27 @@ class BeanstalkTemplate
       parameter 'ApplicationName',
                 :Description => 'The name of the Elastic Beanstalk Application',
                 :Type => 'String',
-                :Default => ref('ApplicationName')
+                :Default =>  '#{@env}'
 
       parameter 'Environment',
-                :Type => 'String'
+                :Type => 'String',
+                :Default => 'stag'
 
       parameter 'IamInstanceProfile',
                 :Type => 'String',
                 :Default => 'EbApp'
 
       resource 'Application', :Type => 'AWS::ElasticBeanstalk::Application', :Properties => {
-          :Description => ref('ApplicationName'),
-          :ApplicationName => join('-', ref('ApplicationName'), ref('Environment')),
+          :Description => '#{@env}',
+          :ApplicationName => '#{@env}',
       }
 
       resource 'ApplicationVersion', :Type => 'AWS::ElasticBeanstalk::ApplicationVersion', :Properties => {
           :ApplicationName => ref('Application'),
           :Description => 'Initial Version',
           :SourceBundle => {
-              :S3Bucket => join('/','br-repos',ref('Environment')),
-              :S3Key => join('',ref('Environment'), '-Dockerrun.aws.json'),
+              :S3Bucket => 'elasticbeanstalk-samples-us-east-1',
+              :S3Key => 'docker-sample.zip',
           },
       }
 
@@ -75,7 +78,7 @@ class BeanstalkTemplate
               {
                   :Namespace => 'aws:elasticbeanstalk:application:environment',
                   :OptionName => 'RACK_ENV',
-                  :Value => find_in_map('LongName', ref('Environment'), 'name'),
+                  :Value => find_in_map('LongName', '#{env_type}', 'name'),
               },
               {
                   :Namespace => 'aws:autoscaling:launchconfiguration',
@@ -95,7 +98,7 @@ class BeanstalkTemplate
               {
                   :Namespace => 'aws:autoscaling:launchconfiguration',
                   :OptionName => 'SecurityGroups',
-                  :Value => join(',', join('-', ref('Environment'), 'br'), ref('InstanceSecurityGroup')),
+                  :Value => join(',', join('-', '#{env_type}', 'br'), ref('InstanceSecurityGroup')),
               },
               { :Namespace => 'aws:autoscaling:updatepolicy:rollingupdate', :OptionName => 'RollingUpdateEnabled', :Value => 'true' },
               { :Namespace => 'aws:autoscaling:updatepolicy:rollingupdate', :OptionName => 'MaxBatchSize', :Value => '1' },
@@ -105,8 +108,8 @@ class BeanstalkTemplate
       }
 
       resource 'EbEnvironment', :Type => 'AWS::ElasticBeanstalk::Environment', :Properties => {
-          :ApplicationName => ref('Application'),
-          :EnvironmentName => join('-', ref('Environment'), ref('ApplicationName'), 'app'),
+          :ApplicationName => '#{@env}',
+          :EnvironmentName => '#{@stack_name}',
           :Description => 'Default Environment',
           :VersionLabel => ref('ApplicationVersion'),
           :TemplateName => ref('ConfigurationTemplate'),
@@ -115,8 +118,8 @@ class BeanstalkTemplate
 
       resource 'HostRecord', :Type => 'AWS::Route53::RecordSet', :Properties => {
           :Comment => 'DNS name for my stack',
-          :HostedZoneName => join('', find_in_map('HostedZoneName', ref('Environment'), 'name'), '.'),
-          :Name => join('.', ref('ApplicationName'), find_in_map('HostedZoneName', ref('Environment'), 'name')),
+          :HostedZoneName => join('', find_in_map('HostedZoneName', '#{env_type}', 'name'), '.'),
+          :Name => join('.', ref('ApplicationName'), find_in_map('HostedZoneName', '#{env_type}', 'name')),
           :ResourceRecords => [ get_att('EbEnvironment', 'EndpointURL') ],
           :TTL => '60',
           :Type => 'CNAME',
@@ -129,4 +132,15 @@ class BeanstalkTemplate
     end.exec!
     "
   end
+
+  def env_type
+    if @env.include?("prod")
+      "prod"
+    elsif @env.include?("stag")
+      "stag"
+    else
+      ""
+    end
+  end
+
 end

data/lib/gantree/cfn/master.rb

@@ -3,6 +3,7 @@ class MasterTemplate
   def initialize params
     @stack_name = params[:stack_name]
     @env = params[:env]
+    @bucket = params[:cfn_bucket]
     @requirements = params[:requirements]
   end
 
@@ -20,9 +21,10 @@ class MasterTemplate
       parameter 'AppTemplate',
                 :Description => 'The key of the template for the EB app/env substack',
                 :Type => 'String',
-                :Default => '#{@env}-elasticbeanstalk.cfn.json'
+                :Default => '#{@env}-beanstalk.cfn.json'
 
       parameter 'KeyName',
+                :Type => 'String',
                 :Default => 'default'
 
       parameter 'InstanceType',
@@ -31,23 +33,23 @@ class MasterTemplate
 
       parameter 'ApplicationName',
                 :Type => 'String',
-                :Default => '#{@stack_name}'
+                :Default => '#{@env}'
 
       parameter 'Environment',
                 :Type => 'String',
-                :Default => '#{@env}'
+                :Default => '#{env_type}'
 
       parameter 'IamInstanceProfile',
                 :Type => 'String',
                 :Default => 'EbApp'
 
       resource 'AppResources', :Type => 'AWS::CloudFormation::Stack', :Properties => {
-          :TemplateURL => join('/', 'http://s3.amazonaws.com/br-templates', ref('ApplicationName'), ref('ResourcesTemplate')),
+          :TemplateURL => join('/', 'http://s3.amazonaws.com', '#{@bucket}', '#{@env}', ref('ResourcesTemplate')),
           :Parameters => { :ApplicationName => ref('ApplicationName') },
       }
 
       resource 'App', :Type => 'AWS::CloudFormation::Stack', :Properties => {
-          :TemplateURL => join('/', 'http://s3.amazonaws.com/#{@cfn_bucket}', ref('ApplicationName'), ref('AppTemplate')),
+          :TemplateURL => join('/', 'http://s3.amazonaws.com','#{@bucket}', '#{@env}', ref('AppTemplate')),
           :Parameters => {
               :KeyName => ref('KeyName'),
               :InstanceSecurityGroup => get_att('AppResources', 'Outputs.InstanceSecurityGroup'),
@@ -64,4 +66,14 @@ class MasterTemplate
 
     end.exec!"
   end
+
+  def env_type
+    if @env.include?("prod")
+      "prod"
+    elsif @env.include?("stag")
+      "stag"
+    else
+      ""
+    end
+  end
 end

data/lib/gantree/cfn/resources.rb

@@ -16,11 +16,10 @@ class ResourcesTemplate
 
       parameter 'ApplicationName',
                 :Type => 'String',
-                :Default => ref('ApplicationName')
+                :Default => '#{@env}'
 
       resource 'InstanceSecurityGroup', :Type => 'AWS::EC2::SecurityGroup', :Properties => {
-          :GroupDescription => join('', 'an EC2 instance security group created for ', ref('ApplicationName')),
-          :SecurityGroupIngress => [],
+          :GroupDescription => join('', 'an EC2 instance security group created for #{@env}')
       }
 
       output 'InstanceSecurityGroup',

data/lib/gantree/version.rb

@@ -1,3 +1,3 @@
 module Gantree
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gantree
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Felix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cloudformation-ruby-dsl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -153,9 +181,9 @@ files:
 - README.md
 - Rakefile
 - bin/gantree
-- cfn/knarr-stag-s3-beanstalk.cfn.json
-- cfn/knarr-stag-s3-master.cfn.json
-- cfn/knarr-stag-s3-resources.cfn.json
+- cfn/knarr-prod-s5-beanstalk.cfn.json
+- cfn/knarr-prod-s5-master.cfn.json
+- cfn/knarr-prod-s5-resources.cfn.json
 - gantree.gemspec
 - lib/gantree.rb
 - lib/gantree/cfn.rb

data/cfn/knarr-stag-s3-beanstalk.cfn.json

@@ -1,311 +0,0 @@
-{
-  "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "Knarr Service Parent Template (2014-08-15)",
-  "Mappings": {
-    "LongName": {
-      "stag": {
-        "name": "staging"
-      },
-      "prod": {
-        "name": "production"
-      }
-    },
-    "HostedZoneName": {
-      "stag": {
-        "name": "sbleacherreport.com"
-      },
-      "prod": {
-        "name": "bleacherreport.com"
-      }
-    }
-  },
-  "Parameters": {
-    "KeyName": {
-      "Description": "The Key Pair to launch instances with",
-      "Type": "String",
-      "Default": "default"
-    },
-    "InstanceSecurityGroup": {
-      "Type": "String"
-    },
-    "InstanceType": {
-      "Description": "EC2 Instance Type",
-      "Type": "String",
-      "AllowedValues": [
-        "t1.micro",
-        "m1.small",
-        "m3.medium",
-        "m3.large",
-        "m3.xlarge",
-        "m3.2xlarge",
-        "c3.large",
-        "c3.xlarge",
-        "c3.2xlarge",
-        "c3.4xlarge",
-        "c3.8xlarge"
-      ],
-      "Default": "m3.large"
-    },
-    "ApplicationName": {
-      "Description": "The name of the Elastic Beanstalk Application",
-      "Type": "String",
-      "Default": "knarr"
-    },
-    "Environment": {
-      "Type": "String"
-    },
-    "IamInstanceProfile": {
-      "Type": "String",
-      "Default": "EbApp"
-    }
-  },
-  "Resources": {
-    "Application": {
-      "Type": "AWS::ElasticBeanstalk::Application",
-      "Properties": {
-        "Description": {
-          "Ref": "ApplicationName"
-        },
-        "ApplicationName": {
-          "Fn::Join": [
-            "-",
-            [
-              {
-                "Ref": "ApplicationName"
-              },
-              {
-                "Ref": "Environment"
-              }
-            ]
-          ]
-        }
-      }
-    },
-    "ApplicationVersion": {
-      "Type": "AWS::ElasticBeanstalk::ApplicationVersion",
-      "Properties": {
-        "ApplicationName": {
-          "Ref": "Application"
-        },
-        "Description": "Initial Version",
-        "SourceBundle": {
-          "S3Bucket": "br-repos",
-          "S3Key": {
-            "Fn::Join": [
-              "",
-              [
-                {
-                  "Ref": "ApplicationName"
-                },
-                "-",
-                {
-                  "Ref": "Environment"
-                },
-                ".zip"
-              ]
-            ]
-          }
-        }
-      }
-    },
-    "ConfigurationTemplate": {
-      "Type": "AWS::ElasticBeanstalk::ConfigurationTemplate",
-      "Properties": {
-        "ApplicationName": {
-          "Ref": "Application"
-        },
-        "SolutionStackName": "64bit Amazon Linux 2014.03 v1.0.1 running Docker 1.0.0",
-        "Description": "Default Configuration Version 1.0 - with SSH access",
-        "OptionSettings": [
-          {
-            "Namespace": "aws:elasticbeanstalk:application:environment",
-            "OptionName": "AWS_REGION",
-            "Value": "us-east-1"
-          },
-          {
-            "Namespace": "aws:elasticbeanstalk:application:environment",
-            "OptionName": "RACK_ENV",
-            "Value": {
-              "Fn::FindInMap": [
-                "LongName",
-                {
-                  "Ref": "Environment"
-                },
-                "name"
-              ]
-            }
-          },
-          {
-            "Namespace": "aws:autoscaling:launchconfiguration",
-            "OptionName": "EC2KeyName",
-            "Value": {
-              "Ref": "KeyName"
-            }
-          },
-          {
-            "Namespace": "aws:autoscaling:launchconfiguration",
-            "OptionName": "IamInstanceProfile",
-            "Value": {
-              "Ref": "IamInstanceProfile"
-            }
-          },
-          {
-            "Namespace": "aws:autoscaling:launchconfiguration",
-            "OptionName": "InstanceType",
-            "Value": {
-              "Ref": "InstanceType"
-            }
-          },
-          {
-            "Namespace": "aws:autoscaling:launchconfiguration",
-            "OptionName": "SecurityGroups",
-            "Value": {
-              "Fn::Join": [
-                ",",
-                [
-                  {
-                    "Fn::Join": [
-                      "-",
-                      [
-                        {
-                          "Ref": "Environment"
-                        },
-                        "br"
-                      ]
-                    ]
-                  },
-                  {
-                    "Ref": "InstanceSecurityGroup"
-                  }
-                ]
-              ]
-            }
-          },
-          {
-            "Namespace": "aws:autoscaling:updatepolicy:rollingupdate",
-            "OptionName": "RollingUpdateEnabled",
-            "Value": "true"
-          },
-          {
-            "Namespace": "aws:autoscaling:updatepolicy:rollingupdate",
-            "OptionName": "MaxBatchSize",
-            "Value": "1"
-          },
-          {
-            "Namespace": "aws:autoscaling:updatepolicy:rollingupdate",
-            "OptionName": "MinInstancesInService",
-            "Value": "2"
-          },
-          {
-            "Namespace": "aws:elasticbeanstalk:hostmanager",
-            "OptionName": "LogPublicationControl",
-            "Value": "true"
-          }
-        ]
-      }
-    },
-    "EbEnvironment": {
-      "Type": "AWS::ElasticBeanstalk::Environment",
-      "Properties": {
-        "ApplicationName": {
-          "Ref": "Application"
-        },
-        "EnvironmentName": {
-          "Fn::Join": [
-            "-",
-            [
-              {
-                "Ref": "Environment"
-              },
-              {
-                "Ref": "ApplicationName"
-              },
-              "app"
-            ]
-          ]
-        },
-        "Description": "Default Environment",
-        "VersionLabel": {
-          "Ref": "ApplicationVersion"
-        },
-        "TemplateName": {
-          "Ref": "ConfigurationTemplate"
-        },
-        "OptionSettings": [
-
-        ]
-      }
-    },
-    "HostRecord": {
-      "Type": "AWS::Route53::RecordSet",
-      "Properties": {
-        "Comment": "DNS name for my stack",
-        "HostedZoneName": {
-          "Fn::Join": [
-            "",
-            [
-              {
-                "Fn::FindInMap": [
-                  "HostedZoneName",
-                  {
-                    "Ref": "Environment"
-                  },
-                  "name"
-                ]
-              },
-              "."
-            ]
-          ]
-        },
-        "Name": {
-          "Fn::Join": [
-            ".",
-            [
-              {
-                "Ref": "ApplicationName"
-              },
-              {
-                "Fn::FindInMap": [
-                  "HostedZoneName",
-                  {
-                    "Ref": "Environment"
-                  },
-                  "name"
-                ]
-              }
-            ]
-          ]
-        },
-        "ResourceRecords": [
-          {
-            "Fn::GetAtt": [
-              "EbEnvironment",
-              "EndpointURL"
-            ]
-          }
-        ],
-        "TTL": "60",
-        "Type": "CNAME"
-      }
-    }
-  },
-  "Outputs": {
-    "URL": {
-      "Description": "URL of the AWS Elastic Beanstalk Environment",
-      "Value": {
-        "Fn::Join": [
-          "",
-          [
-            "http://",
-            {
-              "Fn::GetAtt": [
-                "EbEnvironment",
-                "EndpointURL"
-              ]
-            }
-          ]
-        ]
-      }
-    }
-  }
-}

data/cfn/knarr-stag-s3-master.cfn.json

@@ -1,113 +0,0 @@
-{
-  "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "stag-knarr-app-s3 Master Template",
-  "Parameters": {
-    "ResourcesTemplate": {
-      "Description": "The key of the template for the resources required to run the app",
-      "Type": "String",
-      "Default": "stag-knarr-app-s3-resources.cfn.json"
-    },
-    "AppTemplate": {
-      "Description": "The key of the template for the EB app/env substack",
-      "Type": "String",
-      "Default": "stag-knarr-app-s3-elasticbeanstalk.cfn.json"
-    },
-    "KeyName": {
-      "Default": "default"
-    },
-    "InstanceType": {
-      "Type": "String",
-      "Default": "t1.micro"
-    },
-    "ApplicationName": {
-      "Type": "String"
-    },
-    "Environment": {
-      "Type": "String",
-      "Default": "knarr-stag-s3"
-    },
-    "IamInstanceProfile": {
-      "Type": "String",
-      "Default": "EbApp"
-    }
-  },
-  "Resources": {
-    "AppResources": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "TemplateURL": {
-          "Fn::Join": [
-            "/",
-            [
-              "http://s3.amazonaws.com/br-templates",
-              {
-                "Ref": "ApplicationName"
-              },
-              {
-                "Ref": "ResourcesTemplate"
-              }
-            ]
-          ]
-        },
-        "Parameters": {
-          "ApplicationName": {
-            "Ref": "ApplicationName"
-          }
-        }
-      }
-    },
-    "App": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "TemplateURL": {
-          "Fn::Join": [
-            "/",
-            [
-              "http://s3.amazonaws.com/",
-              {
-                "Ref": "ApplicationName"
-              },
-              {
-                "Ref": "AppTemplate"
-              }
-            ]
-          ]
-        },
-        "Parameters": {
-          "KeyName": {
-            "Ref": "KeyName"
-          },
-          "InstanceSecurityGroup": {
-            "Fn::GetAtt": [
-              "AppResources",
-              "Outputs.InstanceSecurityGroup"
-            ]
-          },
-          "InstanceType": {
-            "Ref": "InstanceType"
-          },
-          "ApplicationName": {
-            "Ref": "ApplicationName"
-          },
-          "Environment": {
-            "Ref": "Environment"
-          },
-          "IamInstanceProfile": {
-            "Ref": "IamInstanceProfile"
-          }
-        }
-      }
-    }
-  },
-  "Outputs": {
-    "URL": {
-      "Description": "URL of the AWS Elastic Beanstalk Environment",
-      "Value": {
-        "Fn::GetAtt": [
-          "App",
-          "Outputs.URL"
-        ]
-      }
-    }
-  }
-}

data/cfn/knarr-stag-s3-resources.cfn.json

@@ -1,40 +0,0 @@
-{
-  "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "knarr-stag-s3 Services Resources (2014-06-30)",
-  "Parameters": {
-    "ApplicationName": {
-      "Type": "String",
-      "Default": {
-        "Ref": "ApplicationName"
-      }
-    }
-  },
-  "Resources": {
-    "InstanceSecurityGroup": {
-      "Type": "AWS::EC2::SecurityGroup",
-      "Properties": {
-        "GroupDescription": {
-          "Fn::Join": [
-            "",
-            [
-              "an EC2 instance security group created for ",
-              {
-                "Ref": "ApplicationName"
-              }
-            ]
-          ]
-        },
-        "SecurityGroupIngress": [
-
-        ]
-      }
-    }
-  },
-  "Outputs": {
-    "InstanceSecurityGroup": {
-      "Value": {
-        "Ref": "InstanceSecurityGroup"
-      }
-    }
-  }
-}