shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-11 05:17:41 +03:00
Code Releases Wiki Activity

The aws-sdk versions required for the marketplace and for EC2 hybrid

Browse Source 
differ
This commit is contained in:
Jaime Melis 2016-06-06 17:49:20 +02:00
parent 2e032046c8
commit 134fe20410
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
share/install_gems/install_gems
View File

@ -2,7 +2,7 @@
require 'pp'
DEFAULT_PRE=%w{sunstone quota cloud auth_ldap vmware oneflow ec2_hybrid oca onedb}
DEFAULT_PRE=%w{sunstone quota cloud auth_ldap vmware oneflow ec2_hybrid oca onedb market}
if defined?(RUBY_VERSION) && RUBY_VERSION>="1.8.7"
SQLITE='sqlite3'
@ -35,6 +35,7 @@ GROUPS={
:oneflow => ['sinatra', 'json', TREETOP, 'parse-cron'],
:ec2_hybrid => 'aws-sdk --version "= 1.66"',
:oca => 'ox',
:market => 'aws-sdk',
:onedb => "mysql"
}

1
src/market_mad/remotes/s3/S3.rb
View File

@ -14,6 +14,7 @@
# limitations under the License. #
# -------------------------------------------------------------------------- #
gem 'aws-sdk', '>=2'
require 'aws-sdk'
# This class is a generic wrapper to the s3 gem.

2
src/vmm_mad/remotes/ec2/ec2_driver.rb
View File

@ -28,6 +28,8 @@ end
EC2_DRIVER_CONF = "#{ETC_LOCATION}/ec2_driver.conf"
EC2_DRIVER_DEFAULT = "#{ETC_LOCATION}/ec2_driver.default"
gem 'aws-sdk', '=1.66'
# Load EC2 credentials and environment
require 'yaml'
require 'rubygems'