awstool 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6965dafb90d27b6f9d45f95ef6327d1cff5fd160
-  data.tar.gz: faeeba88e0ee6d4def432439c2fd5503217180bf
+  metadata.gz: fa7519114222d1de674841c22bee82fc62444d4e
+  data.tar.gz: 57ac99fc9beb9fbb41e576771d3ce9eba096addd
 SHA512:
-  metadata.gz: 3606a6bb437760442340ccbc3cfcdf7c49f34bcb050ae91ca013f2f061ca65a138ad33e0a225f336780df4a1db99ee81c9d5d44537c3be48a6e5fc707eb4045d
-  data.tar.gz: 0a96e5319bcc70a95a2438b7f143af57919260bbbac7378f488af95863bde9870ef19dc30c62868047d3603c29de55b256b3e9821ec75f081e9a23baac91d212
+  metadata.gz: 47e913f259f1c39c6ab791e1fa795e49f0c7cbb03c42e03dec5a58b2097d52616b3b3d2681b7448481681805550a1f15a9482561907c20486b79107ce5b41bc7
+  data.tar.gz: db8eaa00d531d0b330a32f894f00ec2aca07e74b274c1197e08d233eb274248ee3cae14d47a4e254a3dc5251376907e04af6842080112e3d701372c08e7e0c13

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 *.swp
+/bin/console

data/README.md

@@ -1,25 +1,34 @@
-# Awstools
+# Awstool
 
 Tool for launching and configuring AWS EC2 instances.
 
 ## Installation
 
-Not properly gemmed up yet. You'll need to clone and set RUBYLIB environment variable to clonepath/awstools/lib. Requires the fog gem and ruby >=1.9.3.
 ```bash
-export RUBYLIB=/home/user/repos/awstools/lib
-sudo apt-get install ruby-dev # For ubuntu/debian
-gem install fog
+gem install awstool
 ```
 
 ## Usage
 
 Copy example/awstools.yaml to ~/.awstools.yaml. Fill it out to your liking.
 ```bash
-cd awstools/bin
-./awstools hostname
+awstool floop.example.com
 ```
-This will launch and instance and create an A record with route53. 
-
+This will launch and instance and create an A record with route53.
+You can split your settings files up and then merge them on the command line with the -o flag.
+```bash
+awstool -o ~/ubuntu-14.04.yaml,~/webserver.yaml floop.example.com
+```
+This will allow for different levels of templating. Particularly useful for setting puppet 
+options and security groups. Launch a bunch of instances off of the same configs like so.
+```bash
+awstool -o ~/ubuntu-14.04.yaml,~/webserver.yaml floop1.example.com floop2.example.com jb.example.com
+# or
+awstool -o ~/ubuntu-14.04.yaml,~/webserver.yaml floop{1..5}.example.com
+```
+When launching multiple instances the tool will choose a random subnet from the subnet-ids array unless
+the -s flag or the 'subnet-id-index' option is set. It can also balance between the subnets with
+'subnet_balance: true' in settings.
 
 ## Contributing
 

data/bin/awstool

@@ -2,10 +2,17 @@
 
 require 'awstool'
 require 'pp'
-require 'fog'
 
 options = Awstool::Settings.get_options
+pp options
 
-instance = Awstool::Instance.new(options)
-instance.launch
-instance.set_dns
+options['hostnames'].each do |hostname|
+  if options['subnet_balance']
+    options['subnet-id-index'] = ( options['subnet-id-index'] + 1 ) % ( options['subnet-ids'].length - 1 )
+  end
+  options['tags']['Name'] = hostname
+  options['hostname'] = hostname
+  instance = Awstool::Instance.new(options)
+  instance.launch
+  instance.set_dns
+end

data/examples/awstools.yaml

@@ -1,6 +1,8 @@
 key-name: mykey
 image-id: ami-foobar
-subnet-id: subnet-foobar
+subnet-ids: 
+  - subnet-foobar
+  - subnet-foobas
 security-group-ids:
 - sg-foobar
 - sg-foobaz
@@ -11,7 +13,11 @@ region: us-east-1
 instance-type: t2.medium
 facts:
   foo: bar
-csr_attributes: anotherlongstring
-dns_zone:
-  zone-id: FAKEID
-  email: admin@example.com
+puppet_install:
+  package_manager: apt-get
+  repo_package: puppetlabs-release-pc1-trusty.deb
+  csr_attributes: longrandomstring
+  server: puppet.example.com
+  environment: aws
+purge_dns: true
+subnet_balance: true

data/lib/awstool/instance.rb

@@ -1,13 +1,14 @@
 require 'erb'
+require 'fog'
 
 class Awstool::Instance
   def initialize(options)
     @options = options
     @compute = Fog::Compute.new(
-      :provider => 'AWS',
-      :region => @options['region'],
-      :aws_access_key_id => @options['access_key_id'],
-      :aws_secret_access_key => @options['access_key'],
+      provider: 'AWS',
+      region: @options['region'],
+      aws_access_key_id: @options['access_key_id'],
+      aws_secret_access_key: @options['access_key'],
     )
   end
 
@@ -16,7 +17,7 @@ class Awstool::Instance
       image_id:  @options['image-id'],
       flavor_id: @options['instance-type'],
       security_group_ids: @options['security-group-ids'],
-      subnet_id: @options['subnet-id'],
+      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
@@ -27,13 +28,20 @@ class Awstool::Instance
 
   def set_dns
     dns = Fog::DNS.new(
-      :provider => 'AWS',
-      :aws_access_key_id => @options['access_key_id'],
-      :aws_secret_access_key => @options['access_key'],
+      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'])
 
+    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'],

data/lib/awstool/settings.rb

@@ -3,6 +3,7 @@ require 'psych'
 
 class Awstool::Settings
   @options = {}
+  @option_files = []
 
   attr_reader :options
 
@@ -10,6 +11,9 @@ class Awstool::Settings
     set_default
     get_rc
     get_flags
+    @option_files.each do |f|
+      @options.merge!(f)
+    end
     @options
   end
 
@@ -41,17 +45,29 @@ class Awstool::Settings
       opts.on('--debug', 'Prints some extra output helpful for debugging') do
         @options['debug'] = true
       end
-    end.parse!
 
-    [ 'hostname' ].each do |v|
-      if ARGV.empty?
-        puts "#{v} string is required."
-        exit 1
-      else
-        @options[v] = ARGV.shift
+      opts.on('-s', '--subnet-id-index INDEX', 'Select a subnet-id from you subnet-ids array.') do |index|
+        @options['subnet-id-index'] = index.to_i
+      end
+
+      opts.on(
+        '-o',
+        '--options-file FILE1,FILE2',
+        Array,
+        'List option files that will merge and override settings in .awstool.yaml. Last entry takes precedence.' ) do |of|
+        of.each do |f|
+          @option_files << Psych.load_file(File.expand_path(f))
+        end
       end
+
+    end.parse!
+
+    if ARGV.empty?
+      puts "hostname string is required."
+      exit 1
+    else
+      @options['hostnames'] = ARGV
     end
-    @options['tags']['Name'] = @options['hostname']
   end
 
   def self.get_rc
@@ -59,11 +75,13 @@ class Awstool::Settings
     if File.exist?(awsconf)
       @options.merge!(Psych.load_file(awsconf))
     end
+    @options['subnet-id-index'] = rand(@options['subnet-ids'].length - 1 )
   end
 
   def self.set_default
     @options['userdata'] = File.expand_path('../userdata/default.erb')
     @options['facts'] = {}
     @options['tags']= {}
+    @options['hostnames'] = []
   end
 end

data/lib/awstool/version.rb

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

data/userdata/default.erb

@@ -12,12 +12,12 @@ package_upgrade: true
 package_reboot_if_required: true
 
 write_files:
-<% if options['csr_attributes'] %>
+<% if options['puppet_install']['csr_attributes'] %>
   - content: |
       ---
       custom_attributes:
-        1.2.840.113549.1.9.7: <%= options['csr_attributes'] %>
-    path: /etc/puppetlab/puppet/csr_attributes.yaml
+        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| %>
@@ -28,8 +28,18 @@ write_files:
     permissions: '0644'
 <% end %>
       
-<%# runcmd: %>
-<%#   - rpm -ivh https://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm %>
-<%#   - yum -y install puppet-agent %>
-<%#   - puppet agent -t --waitforcert 5  --server henson.uchicago.edu %>
-<%#   - puppet agent -t %>
+<% 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
+<% else %>
+<% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awstool
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Nick Burgess
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,8 +72,6 @@ email:
 - nburgess@uchicago.edu
 executables:
 - awstool
-- console
-- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -85,8 +83,6 @@ files:
 - Rakefile
 - awstools.gemspec
 - bin/awstool
-- bin/console
-- bin/setup
 - examples/awstools.yaml
 - lib/awstool.rb
 - lib/awstool/instance.rb

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "awstool"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here