ops_build 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 257909a588ff5fb5541c2f30a1279f91b0b948d0
-  data.tar.gz: 411ab6ef143ac06d67a22763da9a4275d4f1cba8
+  metadata.gz: ebb6c7d7517a303c66a1586cb9077cb5289f00a2
+  data.tar.gz: fb09cb2c9664a09100c0e9bb88114dcde69c24ac
 SHA512:
-  metadata.gz: 90137abc8e0d7ddb0ef67178538d836f26921eb3c52d07fed7ded8f9b5980df7d41c8c25dc3ca4131d25f5c3b4489e4f7f107eaba59ff54cc1dcca55e940e6a0
-  data.tar.gz: f2ce350c5f24f067b568c10efc9f6f19f306c93646d01ea91534dc00c63614d09eae3186da758f55831d6d036caa6e825e3be6245c132f5954e50c856a6183b1
+  metadata.gz: ccdf2f57d92241ba93d55247b98e82953bdb34ef66ee34836b0e7810da8e604bbf4c1258b97cec9e66ccda68f69f12de5dc56bb54ccdd1647c468ff2fb5629ce
+  data.tar.gz: e1f04a63944e6ba6c7f18bcaa4a747729c953bd2ec2edd476561fd89abe5fd4f86016086c72b460a67325c36f1485a41bb789f2bf2726f6e0292dfcce9846dc7

data/README.md

@@ -6,3 +6,7 @@ ops_build is simple tool which can be used to as one place to go to use various
 * buid amazon aws ami with packer
 * run kitchen server spec tests
 * run chefspec tests on cookbooks
+
+TODO:
+
+* Improve logging

data/lib/ops_build/packer.rb

@@ -6,7 +6,7 @@ module OpsBuild
   require 'tempfile'
 
   class PackerSupport
-    attr_accessor :user_vars, :user_var_file
+    attr_accessor :user_vars, :user_var_file, :packer_log
 
     def initialize()
       @user_vars = {}
@@ -17,6 +17,8 @@ module OpsBuild
       end
     end
 
+    #
+    # Add name/value pair to users_vars hash which is going to be used later for packer var-file
     def packer_add_user_variable(name, value)
       unless name.nil? and value.nil?
         @user_vars[name] = value
@@ -31,11 +33,27 @@ module OpsBuild
       packer_create_var_file()
 
       unless @user_var_file.nil?
-        puts(">>>> Customising packer build with variable file from: #{@user_var_file.path} ")
-        packer_options = "-var-file #{@user_var_file.path}"
+        puts(">>>> Changing packer build with variables file from: #{@user_var_file.path} ")
+        packer_options = "-machine-readable -var-file #{@user_var_file.path}"
+      end
+
+      if @packer_log.nil?
+        packer_create_log_file()
+        puts(">>>> Using file #{@packer_log.path} as log file.")
+      end
+
+      unless system("packer build #{packer_options} #{packer_config} | tee -a #{@packer_log.path}")
+        puts(">>>> Packer build failed.")
+        raise
       end
+      puts(">>>>> packer run exit $?")
+    end
+
+    def packer_get_ami_id()
+      # Get AMI id by greping log for given string and then getting last value
+      ami = File.foreach(@packer_log.path).grep(/amazon-ebs,artifact.*,id/).first.chomp.split(':').last
 
-      system("packer build #{packer_options} #{packer_config}")
+      puts(">>>> Packer built ami: #{ami}")
     end
 
     #
@@ -46,7 +64,7 @@ module OpsBuild
       packer_create_var_file()
 
       unless @user_var_file.nil?
-        puts(">>>> Customising packer build with variable file from: #{@user_var_file.path} ")
+        puts(">>>> Customizing packer build with variable file from: #{@user_var_file.path} ")
         packer_options = "-var-file #{@user_var_file.path}"
       end
 
@@ -57,15 +75,26 @@ module OpsBuild
     end
 
     #
-    # Clean user_var-file from system
+    # Clean user_var-file/packer_log from system
     def packer_cleanup()
       unless @user_var_file.nil?
         @user_var_file.unlink
         @user_var_file.close
       end
+
+      unless @packer_log.nil?
+        @packer_log.unlink
+        @packer_log.close
+      end
     end
 
     private
+    def packer_create_log_file()
+      if @packer_log.nil?
+        @packer_log = Tempfile.new('packer-log-file')
+      end
+    end
+
     def packer_create_var_file()
       if @user_var_file.nil?
         @user_var_file = Tempfile.new('packer-var-file')

data/lib/ops_build/version.rb

@@ -1,3 +1,3 @@
 module OpsBuild
-  VERSION="1.0.4"
+  VERSION="1.0.5"
 end

data/lib/ops_build.rb

@@ -19,6 +19,8 @@ lib = File.expand_path('.', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 class OpsBuilder < Thor
+  class_option :verbose, :type => :boolean
+
   desc 'validate template', 'validate packer template'
   def validate_packer(template)
     packer = OpsBuild::PackerSupport.new
@@ -26,6 +28,10 @@ class OpsBuilder < Thor
   end
 
   desc 'build template', 'build packer template'
+  option :ec2_region, :type => :string, :aliases => 'R', :desc => 'AWS EC2 region'
+  option :aws_access, :type => :string, :aliases => 'A', :desc => 'AWS Access key'
+  option :aws_secret, :type => :string, :aliases => 'S', :desc => 'AWS Secret key'
+  option :berk_dir,   :type => :string, :aliases => 'b', :desc => 'Berkshelf cookbook directory path'
   def build_packer(template)
     packer = OpsBuild::PackerSupport.new
     berkshelf = OpsBuild::BerkshelfSupport.new
@@ -34,10 +40,9 @@ class OpsBuilder < Thor
     puts ">> Building VM using packer from template #{template}"
 
     # Add some config variables
-    packer.packer_add_user_variable(:aws_account_id, aws.aws_get_account_id)
-    packer.packer_add_user_variable(:aws_access_key, aws.aws_get_access_key)
-    packer.packer_add_user_variable(:aws_secret_key, aws.aws_get_secret_key)
-    packer.packer_add_user_variable(:aws_region, aws.aws_get_ec2_region)
+    packer.packer_add_user_variable(:aws_access_key, options[:aws_access].nil? ? aws.aws_get_access_key : options[:aws_access])
+    packer.packer_add_user_variable(:aws_secret_key, options[:aws_secret].nil? ? aws.aws_get_secret_key : options[:aws_secret])
+    packer.packer_add_user_variable(:aws_region, options[:ec2_region].nil? ? aws.aws_get_ec2_region : options[:ec2_region])
     packer.packer_add_user_variable(:cookbook_path, berkshelf.berkshelf_dir)
 
     # Install missing cookbooks
@@ -56,8 +61,16 @@ class OpsBuilder < Thor
     end
     puts ">>>> Vendoring cookbooks with berks to #{berkshelf.berkshelf_dir}"
 
-    # Run packer
-    packer.packer_build(template)
+    begin
+      # Run packer
+      packer.packer_build(template)
+    rescue
+      berkshelf.berks_cleanup()
+      packer.packer_cleanup()
+      exit(1)
+    end
+
+    packer.packer_get_ami_id()
 
     puts ">>>> Cleaning up cookbooks/packer files from system."
     berkshelf.berks_cleanup()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_build
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - HAMSIK Adam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler