wombat-cli 0.2.0 → 0.2.1

data/cookbooks/infranodes/test/integration/default/infranodes_spec.rb

@@ -1,20 +1,22 @@
 # automate tests
 
-describe file('/home/ubuntu/.ssh/authorized_keys') do
-  its('content') { file("/tmp/public.pub").content }
-end
+unless os.windows?
+  describe file("/home/#{os.name}/.ssh/authorized_keys") do
+    its('content') { should include file("/tmp/public.pub").content }
+    it { should exist }
+  end
 
-describe package('push-jobs-client') do
-  it { should be_installed }
+  describe package('push-jobs-client') do
+    it { should be_installed }
+  end
 end
 
-describe file('/etc/hosts') do
+etc_hosts = os.windows? ? 'C:\Windows\System32\Drivers\etc\hosts' : '/etc/hosts'
+
+describe file(etc_hosts) do
   its('content') { should match /172.31.54.10\s.*chef.animals.biz chef/ }
   its('content') { should match /172.31.54.11\s.*automate.animals.biz automate/ }
   its('content') { should match /172.31.54.12\s.*compliance.animals.biz compliance/ }
   its('content') { should match /172.31.54.51\s.*build-node-1.animals.biz build-node-1/ }
   its('content') { should match /172.31.54.201\s.*workstation-1.animals.biz workstation-1/ }
 end
-
-# add tests to verify users and passwords
-# delivery-ctl list-users doesn't work

data/cookbooks/wombat/attributes/default.rb

@@ -12,6 +12,8 @@ default['demo']['versions'].tap do |pkg|
   pkg['chef-server'] = 'stable-latest'
   pkg['automate'] = 'stable-latest'
   pkg['compliance'] = 'stable-latest'
+  pkg['push-jobs-server'] = 'stable-latest'
+  pkg['manage'] = 'stable-latest'
 end
 
 default['demo']['hosts'] = {

data/cookbooks/wombat/metadata.rb

@@ -9,3 +9,5 @@ version '0.2.0'
 depends 'hostsfile'
 depends 'apt'
 depends 'chef-ingredient'
+depends 'sudo'
+depends 'line'

data/cookbooks/wombat/recipes/authorized-keys.rb

@@ -7,4 +7,14 @@
 append_if_no_line "Add certificate to authorized_keys" do
   path "/home/#{node['demo']['admin-user']}/.ssh/authorized_keys"
   line lazy { IO.read('/tmp/public.pub') }
+  not_if { node['platform'] == 'windows' }
+end
+
+node.default['authorization']['sudo']['include_sudoers_d'] = true
+
+sudo 'centos' do
+  user 'centos'
+  nopasswd true
+  defaults ['!requiretty']
+  only_if { node['platform'] == 'centos' }
 end

data/cookbooks/workstation/recipes/certs-keys.rb

@@ -14,7 +14,8 @@ template "#{home}/.ssh/config" do
     home: home,
     server: "#{node['demo']['domain_prefix']}automate.#{node['demo']['domain']}",
     ent: node['demo']['enterprise'],
-    user: "workstation-#{node['demo']['workstation-number']}"
+    automate_user: "workstation-#{node['demo']['workstation-number']}",
+    ssh_user:  node['demo']['admin-user']
   )
 end
 

data/cookbooks/workstation/templates/default/ssh_config.erb

@@ -1,7 +1,7 @@
 Host <%= @server %>
   HostName <%= @server %>
   Port 8989
-  User <%= @user -%>@<%= @ent %>
+  User <%= @automate_user -%>@<%= @ent %>
   IdentityFile <%= @home -%>/.ssh/id_rsa
   IdentitiesOnly yes
   KexAlgorithms +diffie-hellman-group1-sha1
@@ -9,7 +9,7 @@ Host <%= @server %>
 
 Host *
   Port 22
-  User ubuntu
+  User <%= @ssh_user %>
   IdentityFile <%= @home -%>/.ssh/id_rsa
   IdentitiesOnly yes
   KexAlgorithms +diffie-hellman-group1-sha1

data/lib/wombat/build.rb

@@ -17,145 +17,56 @@ class BuildRunner
   end
 
   def start
-    banner("Generating keys (if necessary)")
+    banner("Generating certs (if necessary)")
     wombat['certs'].each do |hostname|
       gen_x509_cert(hostname)
     end
-
+    banner("Generating SSH keypair (if necessary)")
     gen_ssh_key
 
-    if parallel
-      time = Benchmark.measure do
-        banner("Starting parallel build for templates: #{templates}")
-        parallel_pack(templates, builder)
+    time = Benchmark.measure do
+      banner("Starting build for templates: #{templates}")
+      aws_region_check if builder == 'amazon-ebs'
+      templates.each do |t|
+        vendor_cookbooks(t)
       end
-    else
-      time = Benchmark.measure do
-        banner("Starting sequential build for templates: #{templates}")
-        templates.each do |template|
-          options = {}
-          # TODO: this needs to be abstracted badly
-          case template
-          when 'build-node', 'build-nodes'
-            vendor_cookbooks('build-node')
-            build_nodes.each do |name, num|
-              template = 'build-node'
-              options = {'node-number' => num}
-              packer_cmd = Mixlib::ShellOut.new(packer_build(template, builder, options), :timeout => 3600, live_stream: STDOUT)
-              packer_cmd.run_command
-            end
-          when 'workstation', 'workstations'
-            bootstrap_aws
-            vendor_cookbooks('workstation')
-            workstations.each do |name, num|
-              template = 'workstation'
-              options = {'workstation-number' => num}
-              packer_cmd = Mixlib::ShellOut.new(packer_build(template, builder, options), :timeout => 3600, live_stream: STDOUT)
-              packer_cmd.run_command
-            end
-          when 'infranode', 'infranodes'
-            vendor_cookbooks('infranodes')
-            infranodes.each do |name, num|
-              template = 'infranodes'
-              options = {'node-name' => name}
-              packer_cmd = Mixlib::ShellOut.new(packer_build(template, builder, options), :timeout => 3600, live_stream: STDOUT)
-              packer_cmd.run_command
-            end
-          else
-            vendor_cookbooks(template)
-            packer_cmd = Mixlib::ShellOut.new(packer_build(template, builder, options), :timeout => 3600, live_stream: STDOUT)
-            packer_cmd.run_command
-            puts packer_cmd
-            puts packer_cmd.stdout
-            puts packer_cmd.stderr unless packer_cmd.stderr.empty?
-          end
+
+      if parallel.nil?
+        build_hash.each do |k, v|
+          build(v['template'], v['options'])
         end
+      else
+        build_parallel(templates)
       end
     end
+    shell_out_command("say -v fred \"Wombat has made an #{build_hash.keys.to_s}\" for you") if audio?
     banner("Build finished in #{duration(time.real)}.")
   end
 
   private
 
-  def vendor_cookbooks(template)
-    base = template.split('.json')[0].tr('-', '_')
-    rm = Mixlib::ShellOut.new("rm -rf vendored-cookbooks/#{base} cookbooks/#{base}/Berksfile.lock", live_stream: STDOUT)
-    rm.run_command
-    puts "Vendoring cookbooks for #{template}"
-    vendor = Mixlib::ShellOut.new("berks vendor -q -b cookbooks/#{base}/Berksfile vendored-cookbooks/#{base}", live_stream: STDOUT)
-    vendor.run_command
+  def build(template, options)
+    bootstrap_aws if options['os'] == 'windows'
+    shell_out_command(packer_build_cmd(template, builder, options))
   end
 
-  def packer_build(template, builder, options={})
-    # TODO: this is gross and feels gross so maybe we should do it more better
-    create_infranodes_json
-    case template
-    when 'build-node'
-      log_name = "build-node-#{options['node-number']}"
-    when 'workstation'
-      log_name = "workstation-#{options['workstation-number']}"
-    when 'infranodes'
-      log_name = "infranodes-#{options['node-name']}"
-    else
-     log_name = template
+  def build_parallel(templates)
+    Parallel.map(build_hash.keys, in_threads: build_hash.count) do |name|
+      build(build_hash[name]['template'], build_hash[name]['options'])
     end
-
-    case builder
-    when 'amazon-ebs'
-      if template == 'workstation'
-        source_ami = wombat['aws']['source_ami']['windows']
-      else
-        source_ami = wombat['aws']['source_ami']['ubuntu']
-      end
-      if ENV['AWS_REGION']
-        puts "Region set by environment: #{ENV['AWS_REGION']}"
-      else
-        banner("$AWS_REGION not set, setting to #{wombat['aws']['region']}")
-        ENV['AWS_REGION'] = wombat['aws']['region']
-      end
-      log_prefix = "aws"
-    when 'googlecompute'
-      if template == 'workstation'
-        source_image = wombat['gce']['source_image']['windows']
-      else
-        source_image = wombat['gce']['source_image']['ubuntu']
-      end
-      log_prefix = "gce"
-    end
-    # TODO: fail if packer isn't found in a graceful way
-    cmd = %W(packer build #{packer_dir}/#{template}.json | tee #{log_dir}/#{log_prefix}-#{log_name}.log)
-    cmd.insert(2, "--only #{builder}")
-    cmd.insert(2, "--var org=#{wombat['org']}")
-    cmd.insert(2, "--var domain=#{wombat['domain']}")
-    cmd.insert(2, "--var domain_prefix=#{wombat['domain_prefix']}")
-    cmd.insert(2, "--var enterprise=#{wombat['enterprise']}")
-    cmd.insert(2, "--var chefdk=#{wombat['products']['chefdk']}")
-    cmd.insert(2, "--var chef_ver=#{wombat['products']['chef'].split('-')[1]}")
-    cmd.insert(2, "--var chef_channel=#{wombat['products']['chef'].split('-')[0]}")
-    cmd.insert(2, "--var automate=#{wombat['products']['automate']}")
-    cmd.insert(2, "--var compliance=#{wombat['products']['compliance']}")
-    cmd.insert(2, "--var chef-server=#{wombat['products']['chef-server']}")
-    cmd.insert(2, "--var node-name=#{options['node-name']}") if template =~ /infranodes/
-    cmd.insert(2, "--var node-number=#{options['node-number']}") if template =~ /build-node/
-    cmd.insert(2, "--var build-nodes=#{wombat['build-nodes']}")
-    cmd.insert(2, "--var winrm_password=#{wombat['workstation-passwd']}") if template =~ /workstation/
-    cmd.insert(2, "--var workstation-number=#{options['workstation-number']}") if template =~ /workstation/
-    cmd.insert(2, "--var workstations=#{wombat['workstations']}")
-    cmd.insert(2, "--var aws_source_ami=#{source_ami}")
-    cmd.insert(2, "--var gce_source_image=#{source_image}")
-    cmd.join(' ')
   end
 
-  def parallel_pack(templates, builder)
+  def build_hash
     proc_hash = {}
     templates.each do |template_name|
-      if template_name == 'infranodes'
+      if template_name =~ /infranodes/
         infranodes.each do |name, _rl|
           next if name.empty?
           proc_hash[name] = {
-            'template' => 'infranodes',
+            'template' => template_name,
             'options' => {
-              'node-name' => name
+              'node-name' => name,
+              'os' => wombat['infranodes'][name]['platform']
             }
           }
         end
@@ -173,6 +84,7 @@ class BuildRunner
           proc_hash[name] = {
             'template' => 'workstation',
             'options' => {
+              'os' => wombat['workstations']['platform'],
               'workstation-number' => num
             }
           }
@@ -183,13 +95,119 @@ class BuildRunner
           'options' => {}
         }
       end
-      vendor_cookbooks(template_name)
     end
-    puts proc_hash
-    Parallel.map(proc_hash.keys, in_threads: proc_hash.count) do |name|
-      cmd = packer_build(proc_hash[name]['template'], builder, proc_hash[name]['options'])
-      packer_cmd = Mixlib::ShellOut.new(cmd, :timeout => 3600, live_stream: STDOUT)
-      packer_cmd.run_command
+    proc_hash
+  end
+
+  def a_to_s(*args)
+    clean_array(*args).join(" ")
+  end
+
+  def clean_array(*args)
+    args.flatten.reject { |i| i.nil? || i == "" }.map(&:to_s)
+  end
+
+  def b_to_c(builder)
+    case builder
+    when 'amazon-ebs'
+      cloud = 'aws'
+    when 'googlecompute'
+      cloud = 'gce'
+    end
+  end
+
+  def shell_out_command(command)
+    cmd = Mixlib::ShellOut.new(a_to_s(command), :timeout => timeout, live_stream: STDOUT)
+    cmd.run_command
+    cmd
+  end
+
+  def aws_region_check
+    if ENV['AWS_REGION']
+      banner("Region set by environment: #{ENV['AWS_REGION']}")
+    else
+      banner("$AWS_REGION not set, setting to #{wombat['aws']['region']}")
+      ENV['AWS_REGION'] = wombat['aws']['region']
+    end
+  end
+
+  def vendor_cookbooks(template)
+    banner "Vendoring cookbooks for #{template}"
+
+    if template =~ /.*-windows/
+      base = template.split('-')[0]
+    else
+      base = template.split('.json')[0].tr('-', '_')
+    end
+    rm_cmd = "rm -rf #{cookbook_dir}/#{base}/Berksfile.lock vendored-cookbooks/#{base}"
+    shell_out_command(rm_cmd)
+    vendor_cmd = "berks vendor -q -b #{cookbook_dir}/#{base}/Berksfile vendored-cookbooks/#{base}"
+    shell_out_command(vendor_cmd)
+  end
+
+  def log(template, builder, options)
+    cloud = b_to_c(builder)
+    case template
+    when 'build-node'
+      log_name = "#{cloud}-build-node-#{options['node-number']}-#{linux}"
+    when 'workstation'
+      log_name = "#{cloud}-workstation-#{options['workstation-number']}-#{linux}"
+    when /infranodes/
+      if options['os'] =~ /windows/
+        log_name = "#{cloud}-infranodes-#{options['node-name']}-windows"
+      else
+        log_name = "#{cloud}-infranodes-#{options['node-name']}-#{linux}"
+      end
+    else
+     log_name = "#{cloud}-#{template}-#{linux}"
+    end
+    log_file = "#{log_dir}/#{log_name}.log"
+  end
+
+  def packer_build_cmd(template, builder, options)
+    create_infranodes_json
+
+    if template == 'workstation'
+      source_ami = wombat['aws']['source_ami']['windows']
+      source_image = wombat['gce']['source_image']['windows']
+    elsif template =~ /infranodes/
+      if options['os'] == 'windows'
+        source_ami = wombat['aws']['source_ami']['windows']
+        source_image = wombat['gce']['source_image']['windows']
+      else
+        source_ami = wombat['aws']['source_ami'][linux]
+        source_image = wombat['gce']['source_image'][linux]
+      end
+    else
+      source_ami = wombat['aws']['source_ami'][linux]
+      source_image = wombat['gce']['source_image'][linux]
     end
+
+    # TODO: fail if packer isn't found in a graceful way
+    cmd = %W(packer build #{packer_dir}/#{template}.json | tee #{log(template, builder, options)})
+    cmd.insert(2, "--only #{builder}")
+    cmd.insert(2, "--var org=#{wombat['org']}")
+    cmd.insert(2, "--var domain=#{wombat['domain']}")
+    cmd.insert(2, "--var domain_prefix=#{wombat['domain_prefix']}")
+    cmd.insert(2, "--var enterprise=#{wombat['enterprise']}")
+    cmd.insert(2, "--var chefdk=#{wombat['products']['chefdk']}")
+    cmd.insert(2, "--var chef_ver=#{wombat['products']['chef'].split('-')[1]}")
+    cmd.insert(2, "--var chef_channel=#{wombat['products']['chef'].split('-')[0]}")
+    cmd.insert(2, "--var automate=#{wombat['products']['automate']}")
+    cmd.insert(2, "--var compliance=#{wombat['products']['compliance']}")
+    cmd.insert(2, "--var chef-server=#{wombat['products']['chef-server']}")
+    cmd.insert(2, "--var push-jobs-server=#{wombat['products']['push-jobs-server']}")
+    cmd.insert(2, "--var manage=#{wombat['products']['manage']}")
+    cmd.insert(2, "--var node-name=#{options['node-name']}") if template =~ /infranodes/
+    cmd.insert(2, "--var node-number=#{options['node-number']}") if template =~ /build-node/
+    cmd.insert(2, "--var build-nodes=#{wombat['build-nodes']['count']}")
+    cmd.insert(2, "--var winrm_password=#{wombat['workstations']['password']}")
+    cmd.insert(2, "--var winrm_username=Administrator")
+    cmd.insert(2, "--var workstation-number=#{options['workstation-number']}") if template =~ /workstation/
+    cmd.insert(2, "--var workstations=#{wombat['workstations']['count']}")
+    cmd.insert(2, "--var aws_source_ami=#{source_ami}")
+    cmd.insert(2, "--var gce_source_image=#{source_image}")
+    cmd.insert(2, "--var ssh_username=#{linux}")
+    cmd.join(' ')
   end
 end

data/lib/wombat/cli.rb

@@ -99,6 +99,14 @@ class Options
           opts.on("-c CLOUD", "--cloud CLOUD", "Select cloud") do |opt|
             options.cloud = opt
           end
+
+          opts.on("--update-lock", "Update lockfile") do |opt|
+            options.update_lock = opt
+          end
+
+          opts.on("--create-template", "Create template") do |opt|
+            options.create_template = opt
+          end
         },
         argv: stack_argv_proc
       },

data/lib/wombat/common.rb

@@ -40,11 +40,10 @@ module Common
   end
 
   def bootstrap_aws
-    puts 'Generating bootstrap script from template'
-    @workstation_passwd = wombat['workstation-passwd']
+    @workstation_passwd = wombat['workstations']['password']
     rendered = ERB.new(File.read('templates/bootstrap-aws.erb'), nil, '-').result(binding)
     File.open("#{packer_dir}/scripts/bootstrap-aws.txt", 'w') { |file| file.puts rendered }
-    puts "#{packer_dir}/scripts/bootstrap-aws.txt"
+    banner("Generated: #{packer_dir}/scripts/bootstrap-aws.txt")
   end
 
   def gen_x509_cert(hostname)
@@ -100,13 +99,9 @@ module Common
     end
   end
 
-  def parse_log(instance, cloud)
-    case cloud
-    when "aws", "amazon", "jeffbezosband", "cfn"
-      File.read("#{log_dir}/aws-#{instance}.log").split("\n").grep(/#{wombat['aws']['region']}:/) {|x| x.split[1]}.last
-    when "gce", "gcp", "google", "gdm"
-      File.read("#{log_dir}/gce-#{instance}.log").split("\n").grep(/A disk image was created:/) {|x| x.split[1]}.last
-    end
+  def parse_log(log, cloud)
+    regex = cloud == 'gcp' ? "A disk image was created:" : "#{wombat['aws']['region']}:"
+    File.read(log).split("\n").grep(/#{regex}/) {|x| x.split[1]}.last
   end
 
   def infranodes
@@ -119,7 +114,7 @@ module Common
 
   def build_nodes
     build_nodes = {}
-    1.upto(wombat['build-nodes'].to_i) do |i|
+    1.upto(wombat['build-nodes']['count'].to_i) do |i|
       build_nodes["build-node-#{i}"] = i
     end
     build_nodes
@@ -127,7 +122,7 @@ module Common
 
   def workstations
     workstations = {}
-    1.upto(wombat['workstations'].to_i) do |i|
+    1.upto(wombat['workstations']['count'].to_i) do |i|
       workstations["workstation-#{i}"] = i
     end
     workstations
@@ -145,6 +140,10 @@ module Common
     end
   end
 
+  def linux
+    wombat['linux'].nil? ? 'ubuntu' : wombat['linux']
+  end
+
   def key_dir
     wombat['conf'].nil? ? 'keys' : wombat['conf']['key_dir']
   end
@@ -160,4 +159,20 @@ module Common
   def log_dir
     wombat['conf'].nil? ? 'logs' : wombat['conf']['log_dir']
   end
+
+  def stack_dir
+    wombat['conf'].nil? ? 'stacks' : wombat['conf']['stack_dir']
+  end
+
+  def timeout
+    wombat['conf']['timeout'] ||= 7200
+  end
+
+  def is_mac?
+    (/darwin/ =~ RUBY_PLATFORM) != nil
+  end
+
+  def audio?
+    is_mac? && wombat['conf']['audio']
+  end
 end

data/lib/wombat/deploy.rb

@@ -4,18 +4,20 @@ require 'aws-sdk'
 class DeployRunner
   include Common
 
-  attr_reader :stack, :cloud
+  attr_reader :stack, :cloud, :lock_opt, :template_opt
 
   def initialize(opts)
     @stack = opts.stack
     @cloud = opts.cloud.nil? ? "aws" : opts.cloud
+    @lock_opt = opts.update_lock
+    @template_opt = opts.create_template
   end
 
   def start
     case cloud
     when 'aws'
-      update_lock(cloud)
-      create_template
+      update_lock(cloud) if lock_opt
+      create_template if template_opt
       create_stack(stack)
     end
   end
@@ -23,7 +25,7 @@ class DeployRunner
   private
 
   def create_stack(stack)
-    template_file = File.read("#{stack}.json")
+    template_file = File.read("#{stack_dir}/#{@demo}.json")
     cfn = Aws::CloudFormation::Client.new(region: lock['aws']['region'])
 
     banner("Creating CloudFormation stack")
@@ -43,11 +45,12 @@ class DeployRunner
   end
 
   def create_template
+    banner('Creating template...')
     region = lock['aws']['region']
     @chef_server_ami = lock['amis'][region]['chef-server']
     @automate_ami = lock['amis'][region]['automate']
     @compliance_ami = lock['amis'][region]['compliance']
-    @build_nodes = lock['build-nodes'].to_i
+    @build_nodes = lock['build-nodes']['count'].to_i
     @build_node_ami = {}
     1.upto(@build_nodes) do |i|
       @build_node_ami[i] = lock['amis'][region]['build-node'][i.to_s]
@@ -56,7 +59,7 @@ class DeployRunner
     infranodes.each do |name, _rl|
       @infra[name] = lock['amis'][region]['infranodes'][name]
     end
-    @workstations = lock['workstations'].to_i
+    @workstations = lock['workstations']['count'].to_i
     @workstation_ami = {}
     1.upto(@workstations) do |i|
       @workstation_ami[i] = lock['amis'][region]['workstation'][i.to_s]
@@ -66,35 +69,39 @@ class DeployRunner
     @version = lock['version']
     @ttl = lock['ttl']
     rendered_cfn = ERB.new(File.read('templates/cfn.json.erb'), nil, '-').result(binding)
-    File.open("#{@demo}.json", 'w') { |file| file.puts rendered_cfn }
+    File.open("#{stack_dir}/#{@demo}.json", 'w') { |file| file.puts rendered_cfn }
     banner("Generate CloudFormation JSON: #{@demo}.json")
   end
 
+  def logs
+    Dir.glob("#{log_dir}/#{cloud}*.log").reject { |l| !l.match(wombat['linux']) }
+  end
+
   def update_lock(cloud)
+    banner('Updating wombat.lock')
+
     copy = {}
     copy = wombat
     region = copy[cloud]['region']
-    banner('Updating wombat.lock')
+    linux = copy['linux']
     copy['amis'] = { region => {} }
-    Dir.glob("#{log_dir}/#{cloud}*.log") do |log|
-      instance = log.match('aws-(.*)\.log')[1]
-      if instance =~ /build-node/
-        copy['amis'][region].store('build-node', {})
-        1.upto(wombat['build-nodes'].to_i) do |i|
-          copy['amis'][region]['build-node'].store(i.to_s, parse_log("build-node-#{i}", "aws"))
-        end
-      elsif instance =~ /workstation/
-        copy['amis'][region].store('workstation', {})
-        1.upto(wombat['workstations'].to_i) do |i|
-          copy['amis'][region]['workstation'].store(i.to_s, parse_log("workstation-#{i}", "aws"))
-        end
-      elsif instance =~ /infranodes/
-        copy['amis'][region].store('infranodes', {})
-        infranodes.each do |name, _rl|
-          copy['amis'][region]['infranodes'].store(name, parse_log("infranodes-#{name}", "aws"))
-        end
+    logs.each do |log|
+      case log
+      when /build-node/
+        copy['amis'][region]['build-node'] ||= {}
+        num = log.split('-')[3]
+        copy['amis'][region]['build-node'].store(num, parse_log(log, cloud))
+      when /workstation/
+        copy['amis'][region]['workstation'] ||= {}
+        num = log.split('-')[2]
+        copy['amis'][region]['workstation'].store(num, parse_log(log, cloud))
+      when /infranodes/
+        copy['amis'][region]['infranodes'] ||= {}
+        name = log.split('-')[2]
+        copy['amis'][region]['infranodes'].store(name, parse_log(log, cloud))
       else
-        copy['amis'][region].store(instance, parse_log(instance, "aws"))
+        instance = log.match("#{cloud}-(.*)-(.*)\.log")[1]
+        copy['amis'][region].store(instance, parse_log(log, cloud))
       end
     end
     copy['last_updated'] = Time.now.gmtime.strftime('%Y%m%d%H%M%S')

data/lib/wombat/version.rb

@@ -1,3 +1,3 @@
 module Wombat
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/packer/automate.json

@@ -24,7 +24,8 @@
     "domain_prefix": "",
     "enterprise": "mammals",
     "org": "marsupials",
-    "workstations": "1"
+    "workstations": "1",
+    "ssh_username": "ubuntu"
   },
 
   "builders": [
@@ -33,11 +34,11 @@
       "secret_key": "{{user `aws_secret_key`}}",
       "region": "{{user `aws_region`}}",
       "source_ami": "{{user `aws_source_ami`}}",
-      "instance_type": "c3.xlarge",
+      "instance_type": "t2.medium",
       "communicator": "ssh",
       "associate_public_ip_address": true,
       "ssh_private_ip": false,
-      "ssh_username": "ubuntu",
+      "ssh_username": "{{user `ssh_username`}}",
       "ssh_pty" : true,
       "ami_name": "automate-{{timestamp}}"
     },
@@ -68,7 +69,7 @@
       "disk_size": "80",
       "image_name": "automate-{{timestamp}}",
       "machine_type": "n1-standard-2",
-      "ssh_username": "ubuntu",
+      "ssh_username": "{{user `ssh_username`}}",
       "ssh_pty" : true
     }
   ],
@@ -88,9 +89,10 @@
       "type": "chef-solo",
       "install_command": "{{user `chef_install_url`}} | sudo bash -s -- -c {{user `chef_channel`}} -v {{user `chef_ver`}}",
       "cookbook_paths": [ "{{pwd}}/vendored-cookbooks/automate" ],
-      "run_list": [ "apt", "automate" ],
+      "run_list": [ "automate", "wombat::authorized-keys", "wombat::etc-hosts" ],
       "json": {
         "demo": {
+          "admin-user": "{{user `ssh_username`}}",
           "domain_prefix": "{{user `domain_prefix`}}",
           "domain": "{{user `domain`}}",
           "enterprise": "{{user `enterprise`}}",