awstool 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa7519114222d1de674841c22bee82fc62444d4e
-  data.tar.gz: 57ac99fc9beb9fbb41e576771d3ce9eba096addd
+  metadata.gz: 7abfa0e64a3d9a28a994d7e6acc548e57ec86b80
+  data.tar.gz: fd0f4220f55996073e533398435713a52410610f
 SHA512:
-  metadata.gz: 47e913f259f1c39c6ab791e1fa795e49f0c7cbb03c42e03dec5a58b2097d52616b3b3d2681b7448481681805550a1f15a9482561907c20486b79107ce5b41bc7
-  data.tar.gz: db8eaa00d531d0b330a32f894f00ec2aca07e74b274c1197e08d233eb274248ee3cae14d47a4e254a3dc5251376907e04af6842080112e3d701372c08e7e0c13
+  metadata.gz: 7d25c0da9e49ab33136a5c23b331d8003c949289b37140c8d493c327bdbefed73bfd9c8017f402fa491a84c7aaebbe600a62614d1de5dd3bf9557d302720ba17
+  data.tar.gz: f00ed640eac0e9c2afde436636b7972bac82454e26aa48770610b0a520b831f3dbe3dc7cc98373f9cbd5377bed439f206948e854bc77bf17cb45cd55ad3e0022

data/bin/awstool

@@ -4,7 +4,6 @@ require 'awstool'
 require 'pp'
 
 options = Awstool::Settings.get_options
-pp options
 
 options['hostnames'].each do |hostname|
   if options['subnet_balance']

data/lib/awstool.rb

@@ -2,5 +2,5 @@ require "awstool/version"
 require 'awstool/settings'
 require 'awstool/instance'
 
-class Awstools
+module Awstools
 end

data/lib/awstool/instance.rb

@@ -10,6 +10,12 @@ class Awstool::Instance
       aws_access_key_id: @options['access_key_id'],
       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'],
+    )
+
   end
 
   def launch
@@ -20,20 +26,22 @@ 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
+      user_data: ERB.new(File.read(@options['userdata'])).result,
+      block_device_mapping: [
+        {
+          'DeviceName' => '/dev/sda1',
+          'Ebs.VolumeType' => "gp2",
+          'Ebs.VolumeSize' => @options['rootvol_size'],
+          'Ebs.DeleteOnTermination' => 'true'
+        },
+      ],
     )
     @instance.wait_for { ready? }
     pp @instance.reload
   end
 
   def set_dns
-    dns = Fog::DNS.new(
-      provider: 'AWS',
-      aws_access_key_id: @options['access_key_id'],
-      aws_secret_access_key: @options['access_key'],
-    )
-
-    zone = dns.zones.get(@options['dns-zone-id'])
+    zone = @dns.zones.get(@options['dns-zone-id'])
 
     if @options['purge_dns']
       record = zone.records.find { |r| r.name == "#{@options['hostname']}." }
@@ -42,7 +50,7 @@ class Awstool::Instance
       end
     end
 
-    @record = zone.records.create(
+    record = zone.records.create(
       value: @instance.private_ip_address,
       name: @options['hostname'],
       type: 'A'

data/lib/awstool/settings.rb

@@ -31,14 +31,14 @@ class Awstool::Settings
       opts.on('-f', '--facts FACT1,FACT2', Array, 'Seed new instance with puppet facts') do |facts|
         facts.each do |fact|
           split_fact = fact.split('=')
-          @options['facts'][split_fact[0]] = split_fact[1]
+          @options['facts'][split_fact.first] = split_fact[1]
         end
       end
 
       opts.on('-t', '--tags TAG1,TAG2', Array, 'Set EC2 instance tags') do |tags|
         tags.each do |tag|
           split_tag = tag.split('=')
-          @options['tags'][split_tag[0]] = split_tag[1]
+          @options['tags'][split_tag.first] = split_tag[1]
         end
       end
 
@@ -79,9 +79,10 @@ class Awstool::Settings
   end
 
   def self.set_default
-    @options['userdata'] = File.expand_path('../userdata/default.erb')
+    @options['userdata'] = File.expand_path(File.dirname(__FILE__)) + '/../../userdata/default.erb'
     @options['facts'] = {}
     @options['tags']= {}
     @options['hostnames'] = []
+    @options['rootvol_size'] = 8
   end
 end

data/lib/awstool/version.rb

@@ -1,3 +1,3 @@
-class Awstool
-  VERSION = '0.1.0'
+module Awstool
+  VERSION = '0.1.1'
 end

metadata

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