Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

BGBUILD-55: Use euca2ools instead of ec2-ami-tools

  • Loading branch information...
commit 91b7cb13bb0940446f59fee3a8606fe1b5446684 1 parent d76a972
Marek Goldmann authored December 17, 2010
1  delivery/s3/CHANGELOG
... ...
@@ -1,6 +1,7 @@
1 1
 
2 2
 v0.0.5
3 3
 
  4
+* [BGBUILD-55] Use euca2ools instead of ec2-ami-tools
4 5
 * [BGBUILD-115] PackageHelper should take directory instead of file list to package
5 6
 
6 7
 v0.0.4
7  delivery/s3/lib/boxgrinder-build-s3-delivery-plugin/s3-plugin.rb
@@ -162,8 +162,7 @@ def bundle_image( deliverables )
162 162
       aki = "--kernel #{KERNELS['us_east'][@appliance_config.os.name][@appliance_config.os.version][@appliance_config.hardware.base_arch][:aki]}"
163 163
       ari = KERNELS['us_east'][@appliance_config.os.name][@appliance_config.os.version][@appliance_config.hardware.base_arch][:ari].nil? ? "" : "--ramdisk #{KERNELS['us_east'][@appliance_config.os.name][@appliance_config.os.version][@appliance_config.hardware.base_arch][:ari]}"
164 164
 
165  
-      @exec_helper.execute("ec2-bundle-image -i #{deliverables[:disk]} #{aki} #{ari} -c #{@plugin_config['cert_file']} -k #{@plugin_config['key_file']} -u #{@plugin_config['account_number']} -r #{@appliance_config.hardware.base_arch} -d #{@ami_build_dir}")
166  
-      #@exec_helper.execute("euca-bundle-image --ec2cert #{File.dirname(__FILE__)}/src/cert-ec2.pem -i #{deliverables[:disk]} #{aki} #{ari} -c #{@plugin_config['cert_file']} -k #{@plugin_config['key_file']} -u #{@plugin_config['account_number']} -r #{@appliance_config.hardware.base_arch} -d #{@ami_build_dir}")
  165
+      @exec_helper.execute("euca-bundle-image --ec2cert #{File.dirname(__FILE__)}/src/cert-ec2.pem -i #{deliverables[:disk]} #{aki} #{ari} -c #{@plugin_config['cert_file']} -k #{@plugin_config['key_file']} -u #{@plugin_config['account_number']} -r #{@appliance_config.hardware.base_arch} -d #{@ami_build_dir}")
167 166
 
168 167
       @log.info "Bundling AMI finished."
169 168
     end
@@ -188,8 +187,7 @@ def image_already_uploaded?
188 187
     def upload_image
189 188
       @log.info "Uploading #{@appliance_config.name} AMI to bucket '#{@plugin_config['bucket']}'..."
190 189
 
191  
-      @exec_helper.execute("ec2-upload-bundle -b #{ami_bucket_key(@appliance_config.name, @plugin_config['path'])} -m #{@ami_manifest} -a #{@plugin_config['access_key']} -s #{@plugin_config['secret_access_key']} --retry")
192  
-      #@exec_helper.execute("euca-upload-bundle -U #{@plugin_config['url']} -b #{ami_bucket_key(@appliance_config.name, @plugin_config['path'])} -m #{@ami_manifest} -a #{@plugin_config['access_key']} -s #{@plugin_config['secret_access_key']}")
  190
+      @exec_helper.execute("euca-upload-bundle -U #{@plugin_config['url']} -b #{ami_bucket_key(@appliance_config.name, @plugin_config['path'])} -m #{@ami_manifest} -a #{@plugin_config['access_key']} -s #{@plugin_config['secret_access_key']}")
193 191
     end
194 192
 
195 193
     def register_image
@@ -197,7 +195,6 @@ def register_image
197 195
 
198 196
       if info
199 197
         @log.info "Image is registered under id: #{info.imageId}"
200  
-        return
201 198
       else
202 199
         info = @ec2.register_image(:image_location => bucket_manifest_key(@appliance_config.name, @plugin_config['path']))
203 200
         @log.info "Image successfully registered under id: #{info.imageId}."
2  delivery/s3/rubygem-boxgrinder-build-s3-delivery-plugin.spec
@@ -13,7 +13,7 @@ URL: http://www.jboss.org/boxgrinder
13 13
 Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
14 14
 
15 15
 Requires: ruby(abi) = %{rubyabi}
16  
-Requires: euca2ools
  16
+Requires: euca2ools >= 1.3.1-4
17 17
 Requires: rubygem(boxgrinder-build)
18 18
 Requires: rubygem(amazon-ec2)
19 19
 Requires: rubygem(aws)

0 notes on commit 91b7cb1

Please sign in to comment.
Something went wrong with that request. Please try again.