awstool 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbdda7c021771785cd49640a028eec8b8551666d
-  data.tar.gz: 862bbb43473f722000217f63258d5413c7f73979
+  metadata.gz: 4762dd9f95d844c3c8264fb411ee1e18be2c8ad6
+  data.tar.gz: 0c655be925d5b4dc251ca5af37744e087162adaf
 SHA512:
-  metadata.gz: c86056fbedcc08aab885db7fb81f3b364b1790f357e8311c5ddf2d9003e05d28bdbc73b4e7f90bdc4f7b05aae062a48c731362f780f2f6917f5abded03837559
-  data.tar.gz: 89925c7f1dbdea042e38c932e69923bc3970a2e11eaba7e0a13aff54ba45701e9a5cc545140f4f0f349362d6a7ed9a3d155e8b47792a6762687b2ca5cd19585e
+  metadata.gz: 4bc47003f5126bdb6d7adbb7c13cc894735b2a1ca69e4cede3ac5944cfe610e017021c9d4d30f7cfc805a7cecf655ef1de47bdfc65e3a95751fb56c641b0465c
+  data.tar.gz: 4a1b60fdc47cd3270b76ff9bf42956ce59aa43f26aa8a3d8445854e6c276069ef887257dd2576c595c5cf84c6843c38b483d1f909c5d596213f5b090ab823c7e

data/examples/awstools.yaml

@@ -1,8 +1,8 @@
 key-name: mykey
 image-id: ami-foobar
 subnet-ids: 
-  - subnet-foobar
-  - subnet-foobas
+- subnet-foobar
+- subnet-foobas
 security-group-ids:
 - sg-foobar
 - sg-foobaz
@@ -21,3 +21,9 @@ puppet_install:
   environment: aws
 purge_dns: true
 subnet_balance: true
+rootvol_size: 10
+block_devices:
+  xvdf:
+    mountpoint: /www
+    size: 20
+    filesystem: ext4

data/lib/awstool/instance.rb

@@ -8,18 +8,18 @@ class Awstool::Instance
       provider: 'AWS',
       region: @options['region'],
       aws_access_key_id: @options['access_key_id'],
-      aws_secret_access_key: @options['access_key'],
+      aws_secret_access_key: @options['access_key']
     )
     @dns = Fog::DNS.new(
       provider: 'AWS',
       aws_access_key_id: @options['access_key_id'],
-      aws_secret_access_key: @options['access_key'],
+      aws_secret_access_key: @options['access_key']
     )
-
   end
 
   def launch
     b = binding
+    userdata = ERB.new(File.read(@options['userdata']), nil, '<>').result(b)
     @instance = @compute.servers.create(
       image_id:  @options['image-id'],
       flavor_id: @options['instance-type'],
@@ -27,15 +27,8 @@ class Awstool::Instance
       subnet_id: @options['subnet-ids'][@options['subnet-id-index']],
       key_name: @options['key-name'],
       tags: @options['tags'],
-      user_data: ERB.new(File.read(@options['userdata'])).result(b),
-      block_device_mapping: [
-        {
-          'DeviceName' => '/dev/sda1',
-          'Ebs.VolumeType' => "gp2",
-          'Ebs.VolumeSize' => @options['rootvol_size'],
-          'Ebs.DeleteOnTermination' => 'true'
-        },
-      ],
+      user_data: userdata,
+      block_device_mapping: map_block_devices
     )
     @instance.wait_for { ready? }
     pp @instance.reload
@@ -43,18 +36,38 @@ class Awstool::Instance
 
   def set_dns
     zone = @dns.zones.get(@options['dns-zone-id'])
-
     if @options['purge_dns']
       record = zone.records.find { |r| r.name == "#{@options['hostname']}." }
       if record
         record.destroy
       end
     end
-
     record = zone.records.create(
       value: @instance.private_ip_address,
       name: @options['hostname'],
       type: 'A'
     )
   end
+
+  private
+
+  def map_block_devices
+    block_device_mapping = [
+      {
+        'DeviceName' => '/dev/sda1',
+        'Ebs.VolumeType' => 'gp2',
+        'Ebs.VolumeSize' => @options['rootvol_size'],
+        'Ebs.DeleteOnTermination' => 'true'
+      }
+    ]
+    @options['block_devices'].each do |device, opts|
+      block_device_mapping << {
+        'DeviceName' => "/dev/#{device}",
+        'Ebs.VolumeType' => 'gp2',
+        'Ebs.VolumeSize' => opts['size'],
+        'Ebs.DeleteOnTermination' => 'true'
+      }
+    end
+    block_device_mapping
+  end
 end

data/lib/awstool/settings.rb

@@ -84,5 +84,6 @@ class Awstool::Settings
     @options['tags']= {}
     @options['hostnames'] = []
     @options['rootvol_size'] = 8
+    @options['block_devices'] = []
   end
 end

data/lib/awstool/version.rb

@@ -1,3 +1,3 @@
 module Awstool
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/userdata/default.erb

@@ -1,8 +1,8 @@
 #cloud-config
 
 bootcmd:
-  - echo <%= @options['hostname'] %> > /etc/hostname
-  - hostname -F /etc/hostname
+- echo <%= @options['hostname'] %> > /etc/hostname
+- hostname -F /etc/hostname
 
 hostname: <%= @options['hostname'] %>
 fqdn: <%= @options['hostname'] %>
@@ -11,35 +11,58 @@ manage_etc_hosts: true
 package_upgrade: true
 package_reboot_if_required: true
 
+disk_setup:
+<% @options['block_devices'].each do |device, opts| %>
+  /dev/<%= device %>:
+    table_type: mbr
+    layout: true
+    overwrite: true
+<% end %>
+
+fs_setup:
+<% @options['block_devices'].each do |device, opts| %>
+- label: None
+  filesystem: <%= opts['filesystem'] %>
+  device: /dev/<%= device %>1
+  partition: auto
+<% end %>
+
+mounts:
+<% @options['block_devices'].each do |device, opts| %>
+- [ /dev/<%= device %>1, <%= opts['mountpoint'] %>, <%= opts['filesystem'] %>, 'defaults,noatime' ]
+<% end %>
+
+mount_default_fields: [ None, None, "ext3", "defaults,noatime", "0","2" ]
+
 write_files:
 <% if @options['puppet_install']['csr_attributes'] %>
-  - content: |
-      ---
-      custom_attributes:
-        1.2.840.113549.1.9.7: <%= @options['puppet_install']['csr_attributes'] %>
-    path: /etc/puppetlabs/puppet/csr_attributes.yaml
-    permissions: 0600
+- content: |
+    ---
+    custom_attributes:
+      1.2.840.113549.1.9.7: <%= @options['puppet_install']['csr_attributes'] %>
+  path: /etc/puppetlabs/puppet/csr_attributes.yaml
+  permissions: 0600
 <% end %>
 <% @options['facts'].each do |fact, value| %>
-  - content: |
-      ---
-      <%= fact %>: <%= value %>
-    path: /opt/puppetlabs/facter/facts.d/<%= fact %>.yaml
-    permissions: '0644'
+- content: |
+    ---
+    <%= fact %>: <%= value %>
+  path: /opt/puppetlabs/facter/facts.d/<%= fact %>.yaml
+  permissions: '0644'
 <% end %>
-      
+
 <% if @options['puppet_install'] %>
 runcmd:
-  <% if @options['puppet_install']['package_manager'] == 'apt-get' %>
-  - wget https://apt.puppetlabs.com/<%= @options['puppet_install']['repo_package'] %>
-  - dpkg -i /<%= @options['puppet_install']['repo_package'] %>
-  - apt-get update
-  - apt-get -y install puppet-agent
-  <% elsif @options['puppet_install']['package_manager'] == 'yum' %>
-  - rpm -ivh https://yum.puppetlabs.com/<%= @options['puppet_install']['repo_package'] %>
-  - yum -y install puppet-agent
-  <% end %>
-  - /opt/puppetlabs/bin/puppet agent -t --waitforcert 5  --server <%= @options['puppet_install']['server'] %> <% if @options['puppet_install']['environment'] %> --environment <%= @options['puppet_install']['environment'] %><% end %>
-  - /opt/puppetlabs/bin/puppet agent -t
+<% if @options['puppet_install']['package_manager'] == 'apt-get' %>
+- wget https://apt.puppetlabs.com/<%= @options['puppet_install']['repo_package'] %>
+- dpkg -i /<%= @options['puppet_install']['repo_package'] %>
+- apt-get update
+- apt-get -y install puppet-agent
+<% elsif @options['puppet_install']['package_manager'] == 'yum' %>
+- rpm -ivh https://yum.puppetlabs.com/<%= @options['puppet_install']['repo_package'] %>
+- yum -y install puppet-agent
+<% end %>
+- /opt/puppetlabs/bin/puppet agent -t --waitforcert 5  --server <%= @options['puppet_install']['server'] %> <% if @options['puppet_install']['environment'] %> --environment <%= @options['puppet_install']['environment'] %><% end %>
+- /opt/puppetlabs/bin/puppet agent -t
 <% else %>
 <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awstool
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Nick Burgess
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler