aws-must 0.0.5 → 0.0.6

data/demo/7/resourceInstance.mustache

@@ -13,6 +13,7 @@ Create an EC2 instance
 * `Name`: name of the EC2 instance to create
 * `InstanceType` : The instance type, such as t2.micro. 
 * `tags` : array of tag sub-documents for EC2 instance
+* `InstallChef`: add UserData to install Chef
 
 
 **Actions**:
@@ -23,9 +24,10 @@ Create an EC2 instance
 * **SecurityGroups.Ref**: `SecurityGroup` if `SecurityGroup`
 * **ImageId**: **AWSRegionArch2AMI**( 'AWS::Region', **AWSInstanceType2Arch**(`InstanceType`))
 * **KeyName**: `KeyName` if `KeyName`
+* **include** <a href="#resourceInstanceChef.mustache">resourceInstanceChef.mustache</a> if `InstallChef`
 
 > tag
-
+> resourceInstanceChef
 
 ++close++
 
@@ -41,5 +43,6 @@ Create an EC2 instance
         , "Tags" : [ {{#tags}}{{>tag}}{{/tags}} ]
         {{#SecurityGroup}}, "SecurityGroups" : [ { "Ref" : "{{SecurityGroup}}" } ]{{/SecurityGroup}}
         {{#KeyName}}, "KeyName" : { "Ref" : "{{KeyName}}" }{{/KeyName}}
-      } {{! Propertites }}
+        {{#InstallChef }}, "UserData": { {{> resourceInstanceChef }} }{{/ InstallChef }}
+      }
     }{{_comma}}

data/demo/7/root.mustache

@@ -41,8 +41,9 @@ CONTENT section
 
 Creates 
 
-* **EC2 SecurityGroup** allowing ssh via port 22 from a location given
-    as `SSHLocation` parameter
+* **EC2 SecurityGroup** allowing ssh via port 22 from a location
+    given as `SSHLocation` parameter
+
 
 * **EC2 instances** using YAML parameter `InstanceType`
   (e.g. t2.micro).
@@ -53,15 +54,19 @@ Creates
     eu-west-1, sa-east-1, us-east-1, us-gov-west-1, us-west-1,
     us-west-2.  
 
+  * optionally installs Chef to the EC2 instance with a version given
+    as `ChefVersion` parameter
+
   * output section contains references to InstanceId and PublicId of
     the newly created EC2 instance.
 
-
 **Parameters**:
 
 * `InstanceType`: EC2 resource instance type, (default: t2.micro)
 * `KeyName` : Name of an existing EC2 KeyPair to enable SSH access to the instance, (default: demo-key)
 * `SSHLocation`: The IP address range that can be used to SSH to the EC2 instances default: 0.0.0.0/0)
+* `ChefVersion`: Chef version to install, (default: 11.18)
+
 
 ## Document Content
 
@@ -113,6 +118,9 @@ href="#resourceInstance.mustache">resourceInstance.mustache</a>:
 create an EC2 instance</li>
 
 <ul><li><a href="#tag.mustache">tag.mustache</a>: add key-value tag property
+to an</li>
+
+<li><a href="#resourceInstanceChef.mustache">resourceInstanceChef.mustache</a>: UserData -script to install Chef
 to an</li><ul>
 
 </ul></ul></ul></ul>

data/lib/tasks/demo.rake

@@ -22,13 +22,12 @@ namespace "demo" do |ns|
   [ 
 
    { :id => "1", :desc=>"Initial copy", :region=>['eu-central-1'], :ssh => false },
-   { :id => "2", :desc=>"Added 'description' -property to YAML file", :region=>['eu-central-1'], :ssh => false  },
-   { :id => "3", :desc=>"Use resources.mustache -partial to create EC2 intance", :region=>['eu-central-1'], :ssh => false    },
-   { :id => "4", :desc=>"EC2 instance configuration using YAML-data", :region=>['eu-central-1'], :ssh => false    },
-   { :id => "5", :desc=>"Add 'Outputs' -section with reference to EC2 instance", :region=>['eu-central-1'], :ssh => false    },
-   { :id => "6", :desc=>"Add 'Inputs' and 'Mappings' -sections to parametirize", :region=> all_regions, :ssh => true  },
-   { :id => "7", :desc=>"Added support for input parameters, EC2 tags, Instance security group", :region=>all_regions, :ssh => true  },
-   { :id => "8", :desc=>"Added support for installing Chef", :region=>all_regions, :ssh => true  },
+   { :id => "2", :desc=>"Added 'description' property, Use resources.mustache -partial", :region=>['eu-central-1'], :ssh => false    },
+   { :id => "3", :desc=>"EC2 instance configuration using YAML-data", :region=>['eu-central-1'], :ssh => false    },
+   { :id => "4", :desc=>"Add 'Outputs' -section with reference to EC2 instance", :region=>['eu-central-1'], :ssh => false    },
+   { :id => "5", :desc=>"Add 'Inputs' and 'Mappings' -sections to parametirize", :region=> all_regions, :ssh => false  },
+   { :id => "6", :desc=>"Create security group, and EC2 instances", :region=>all_regions, :ssh => true  },
+   { :id => "7", :desc=>"Add support for installing Chef", :region=>all_regions, :ssh => true  },
 
 
   ].each do  |c|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-must
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - jarjuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -39,17 +39,25 @@ files:
 - demo/0/root.mustache
 - demo/1/conf.yaml
 - demo/1/root.mustache
+- demo/2.old/conf.yaml
+- demo/2.old/root.mustache
 - demo/2/conf.yaml
+- demo/2/resources.mustache
 - demo/2/root.mustache
 - demo/3/conf.yaml
+- demo/3/resource.mustache
+- demo/3/resourceInstance.mustache
 - demo/3/resources.mustache
 - demo/3/root.mustache
 - demo/4/conf.yaml
+- demo/4/output.mustache
 - demo/4/resource.mustache
 - demo/4/resourceInstance.mustache
+- demo/4/resourceSecurityGroup.mustache
 - demo/4/resources.mustache
 - demo/4/root.mustache
 - demo/5/conf.yaml
+- demo/5/mappings.mustache
 - demo/5/output.mustache
 - demo/5/resource.mustache
 - demo/5/resourceInstance.mustache
@@ -58,31 +66,24 @@ files:
 - demo/6/conf.yaml
 - demo/6/mappings.mustache
 - demo/6/output.mustache
+- demo/6/parameter.mustache
 - demo/6/resource.mustache
 - demo/6/resourceInstance.mustache
+- demo/6/resourceSecurityGroup.mustache
 - demo/6/resources.mustache
 - demo/6/root.mustache
+- demo/6/tag.mustache
 - demo/7/conf.yaml
 - demo/7/mappings.mustache
 - demo/7/output.mustache
 - demo/7/parameter.mustache
 - demo/7/resource.mustache
 - demo/7/resourceInstance.mustache
+- demo/7/resourceInstanceChef.mustache
 - demo/7/resourceSecurityGroup.mustache
 - demo/7/resources.mustache
 - demo/7/root.mustache
 - demo/7/tag.mustache
-- demo/8/conf.yaml
-- demo/8/mappings.mustache
-- demo/8/output.mustache
-- demo/8/parameter.mustache
-- demo/8/resource.mustache
-- demo/8/resourceInstance.mustache
-- demo/8/resourceInstanceChef.mustache
-- demo/8/resourceSecurityGroup.mustache
-- demo/8/resources.mustache
-- demo/8/root.mustache
-- demo/8/tag.mustache
 - lib/aws-must.rb
 - lib/aws-must/aws-must.rb
 - lib/aws-must/docu.rb

data/demo/8/conf.yaml

@@ -1,61 +0,0 @@
--- demo/2 : added description property
-
-
-description: "demo/8 - A simple Amazon EC2 instance created using aws-must tool
-             - Minimum Viable Solution to Manage CloudFormation
-             Templates. Adds support installing Chef"
-
-parameters:
-
-        -  Name: InstanceType
-           Type: String
-           Description: EC2 reousrce instance type
-           Value: &Param_InstanceType t2.micro
-
-        -  Name: &Param_KeyName KeyName
-           Type: "AWS::EC2::KeyPair::KeyName"
-           Description: Name of an existing EC2 KeyPair to enable SSH access to the instance
-           Value: demo-key
-
-        -  Name: &Param_SSHLocation  SSHLocation
-           Type: String
-           Description: The IP address range that can be used to SSH to the EC2 instances
-           Value: "0.0.0.0/0"
-
-        -  Name: ChefVersion
-           Type: String
-           Description: Chef version to install
-           Value: &Param_ChefVersion 11.18
-
-
-resources:
-
-        - InstanceSecurityGroup:
-                 Name: &DefaultSG MyDefaultSecurityGroup
-                 IngressRef: *Param_SSHLocation
-
-        -  Instance: 
-                 Name: &Resource_1 MyEC2Instance
-                 InstanceType: *Param_InstanceType
-                 KeyName: *Param_KeyName
-                 SecurityGroup: *DefaultSG
-                 InstallChef: 
-                    - Version: *Param_ChefVersion
-                 tags:
-                    - Key: demotag1
-                      Value: demotag1 value
-
-
-outputs:
-
-        -  Name: Instance1
-           Description: InstanceId of the newly created EC2 instance
-           Ref:  *Resource_1
-
-
-        -  Name: IP1
-           Description: Public IP address of the newly created EC2 instance
-           Attr: 
-                 Ref: *Resource_1
-                 Name: PublicIp
-

data/demo/8/resource.mustache

@@ -1,38 +0,0 @@
-{{!
-
-    resource.mustache
-
-++start++
-
-## <a id="resource.mustache"></a>resource.mustache <a class='navigator' href='#top'">[top]</a>
-
-
-Dispatches resource sub-type templates based resource Type propertys
-
-**Attributes**: context=  `./resources`
-
-* `Instance`: sub-document defining an EC instance
-* `SecurityGroup`: sub-document defining an <a href="http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group.html">AWS::EC2::SecurityGroup</a>
-
-
-**Actions**:
-
-* **include** <a href="#resourceInstance.mustache">resourceInstance.mustache</a> **if** `Instance` 
-* **include** <a href="#resourceSecurityGroup.mustache">resourceSecurityGroup.mustache</a> **if** `SecurityGroup` 
-
-
-**Included resources**
-
-* `resourceInstance`
-
-> resourceInstance
-> resourceSecurityGroup.mustache
-
-++close++
-
-
-
-}}
-
-{{# Instance }}{{> resourceInstance}}{{/ Instance }}
-{{# InstanceSecurityGroup }}{{> resourceSecurityGroup}}{{/ InstanceSecurityGroup }}

data/demo/8/resourceInstance.mustache

@@ -1,50 +0,0 @@
-{{!
-
-
-++start++
-
-
-## <a id="resourceInstance.mustache"></a>resourceInstance.mustache <a class='navigator' href='#top'">[top]</a>
-
-Create an EC2 instance
-
-**Attributes**: context=  `./resources/Instance`
-
-* `Name`: name of the EC2 instance to create
-* `InstanceType` : The instance type, such as t2.micro. 
-* `tags` : array of tag sub-documents for EC2 instance
-* `InstallChef`: add UserData to install Chef
-
-
-**Actions**:
-
-* **Name**:  `Name`
-* **Type**: 'AWS::EC2::Instance'
-* **for** `tag` **in** `tags` **include**  <a href="#tag.mustache">tag.mustache</a>
-* **SecurityGroups.Ref**: `SecurityGroup` if `SecurityGroup`
-* **ImageId**: **AWSRegionArch2AMI**( 'AWS::Region', **AWSInstanceType2Arch**(`InstanceType`))
-* **KeyName**: `KeyName` if `KeyName`
-* **include** <a href="#resourceInstanceChef.mustache">resourceInstanceChef.mustache</a> if `InstallChef`
-
-> tag
-> resourceInstanceChef
-
-++close++
-
-}}
-
-
-    "{{Name}}" : {
-      "Type" : "AWS::EC2::Instance",
-      "Properties" : {
-        "ImageId" : { "Fn::FindInMap" : [ "AWSRegionArch2AMI", { "Ref" : "AWS::Region" },
-	 	    { "Fn::FindInMap" : [ "AWSInstanceType2Arch", "{{InstanceType}}", "Arch" ] } ] }
-        , "InstanceType" : "{{InstanceType}}"
-        , "Tags" : [ {{#tags}}{{>tag}}{{/tags}} ]
-        {{#SecurityGroup}}, "SecurityGroups" : [ { "Ref" : "{{SecurityGroup}}" } ]{{/SecurityGroup}}
-        {{#KeyName}}, "KeyName" : { "Ref" : "{{KeyName}}" }{{/KeyName}}
-        {{#InstallChef }}, "UserData": { {{> resourceInstanceChef }} }{{/ InstallChef }}
-      } {{! Propertites }}
-            
-
-    }{{_comma}}

data/demo/8/root.mustache

@@ -1,191 +0,0 @@
-{{!
-
-     root.mustache: root level template, 
-
-==================================================================
-STYLE section
-==================================================================
-
-++start++
-<style>
-h1 {
-    color:blue; 
-    font-size: 2.5em;
-   }
-h2 {
-      color:blue;
-      font-size: 1.5em;
-   }
-h3 {
-      color:blue;
-      font-size: 1.5em;
-   }
-.navigator {
-      font-size: 0.5em;
-   }
-body {
-    background-color: #b0c4de;
-} 
-</style>
-
-++close++
-
-
-==================================================================
-CONTENT section
-==================================================================
-
-++start++
-
-# <a id="top">aws-must demo 8 template</a>
-
-Creates 
-
-* **EC2 SecurityGroup** allowing ssh via port 22 from a location
-    given as `SSHLocation` parameter
-
-
-* **EC2 instances** using YAML parameter `InstanceType`
-  (e.g. t2.micro).
-
-  * `ImageId` of the AMI is determined using CloudFormation mapping on
-    `InstanceType` and region. Supported regions are ap-northeast-1,
-    ap-southeast-1, ap-southeast-2, cn-north-1, eu-central-1,
-    eu-west-1, sa-east-1, us-east-1, us-gov-west-1, us-west-1,
-    us-west-2.  
-
-  * optionally installs Chef to the EC2 instance with a version given
-    as `ChefVersion` parameter
-
-  * output section contains references to InstanceId and PublicId of
-    the newly created EC2 instance.
-
-**Parameters**:
-
-* `InstanceType`: EC2 resource instance type, (default: t2.micro)
-* `KeyName` : Name of an existing EC2 KeyPair to enable SSH access to the instance, (default: demo-key)
-* `SSHLocation`: The IP address range that can be used to SSH to the EC2 instances default: 0.0.0.0/0)
-* `ChefVersion`: Chef version to install, (default: 11.18)
-
-
-## Document Content
-
-This document is generated automically from `aws-must` -demo
-templates. 
-
-
-Output contains markdown syntax between
-**&plus;&plus;start&plus;&plus;** and
-**&plus;&plus;close&plus;&plus;** -tags from the template files. For
-each template, it
-
-* gives a general description of the template
-
-* documents the attribute context e.g. `.` or `./resources/Instance`,
-  and attributes referenced within the template
-
-* lists template actions, i.e.  output from template, or template
-  inclusion
-
-### Table of contents
-<ul>
-
-<li><a href="#root.mustache">root.mustache</a>: root template =
-starting point of template rendering</li>
-
-<li><a href="#parameter.mustache">parameter.mustache</a>: create one
-parameter entry to CloudFormation JSON parameter section</li>
-
-<li><a href="#mappings.mustache">mappings.mustache</a>matches a key to
-a corresponding set of named values</li>
-
-<li>Resources</li>
-
-<ul>
-
-<li><a href="#resources.mustache">resources.mustache</a>: fixed
-resources</li>
-
-<li><a href="#resource.mustache">resource.mustache</a>: dispatch
-resource based on resource type</li>
-
-<ul> <li><a
-href="#resourceSecurityGroup.mustache">resourceSecurityGroup.mustache.mustache</a>:
-create an security group for accessing EC2 instances</li>
-
-<li><a
-href="#resourceInstance.mustache">resourceInstance.mustache</a>:
-create an EC2 instance</li>
-
-<ul><li><a href="#tag.mustache">tag.mustache</a>: add key-value tag property
-to an</li>
-
-<li><a href="#resourceInstanceChef.mustache">resourceInstanceChef.mustache</a>: UserData -script to install Chef
-to an</li><ul>
-
-</ul></ul></ul></ul>
-
-<li><a href="#output.mustache">output.mustache</a>: values in
-response to describe stack calls </li> </ul>
-
-
-## <a id="root.mustache"></a>root.mustache <a class='navigator' href='#top'">[top]</a>
-
-Starting point of template rendering.
-
-**Attributes**: context= `.`
-
-* `description`: description for the CF template
-* `parameters`: array of parameter sub-documents for CloudFormation Parameters -section
-* `resources`: array of resource sub-documents for CloudFormation Resources -section
-* `outputs`: array of output sub-documents for CloudFormation Outputs -section
-
-
-**Actions**:
-
-* **Description**: `description`
-* **for** `parameter` **in** `parameters`  **include** <a href="#parameter.mustache">parameter.mustache</a>
-* **include** <a href="#mappings.mustache">mappings.mustache</a>
-* **include** <a href="#resources.mustache">resources.mustache</a>
-* **for** `resource` **in** `resource` **include** <a href="#resource.mustache">resource.mustache</a>
-* **for** `output` **in** `outputs` **include** <a href="#output.mustache">output.mustache</a>
-
-
-> parameter
-> mappings
-> resources
-> resource
-> output
-
-
-++close++
-
-}}
-
-{
-  "AWSTemplateFormatVersion" : "2010-09-09",
-
-  "Description" : "{{description}}",
-
-  "Parameters" : {
-    {{# parameters }}{{> parameter }}{{/ parameters }}
-  },
-
-  "Mappings" : {
-    {{> mappings }}
-   },
-
-  "Resources" : {
-
-    {{> resources }}
-    {{# resources }}{{> resource }}{{/ resources }}
-
-  },
-
-  "Outputs" : {
-
-    {{# outputs }}{{> output }}{{/ outputs }}
-
-  }
-
-}