shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-13 12:58:17 +03:00
Code Releases Wiki Activity

Remove ec2 credentials from .conf

Browse Source
This commit is contained in:
Tino Vazquez 2017-06-16 12:45:56 +02:00
parent 8d9bada5d9
commit 697fc25ec9
2 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/vmm_mad/remotes/ec2/ec2_driver.conf
View File

@ -3,72 +3,54 @@ state_wait_timeout_seconds: 300
regions:
default:
region_name: us-east-1
access_key_id:
secret_access_key:
capacity:
m1.small: 5
m1.large: 0
m1.xlarge: 0
us-east-1:
region_name: us-east-1
access_key_id:
secret_access_key:
capacity:
m1.small:
m1.large:
m1.xlarge:
us-west-2:
region_name: us-west-2
access_key_id:
secret_access_key:
capacity:
m1.small:
m1.large:
m1.xlarge:
us-west-1:
region_name: us-west-1
access_key_id:
secret_access_key:
capacity:
m1.small:
m1.large:
m1.xlarge:
eu-west-1:
region_name: eu-west-1
access_key_id:
secret_access_key:
capacity:
m1.small:
m1.large:
m1.xlarge:
ap-southeast-1:
region_name: ap-southeast-1
access_key_id:
secret_access_key:
capacity:
m1.small:
m1.large:
m1.xlarge:
ap-southeast-2:
region_name: ap-southeast-2
access_key_id:
secret_access_key:
capacity:
m1.small:
m1.large:
m1.xlarge:
ap-northeast-1:
region_name: ap-northeast-1
access_key_id:
secret_access_key:
capacity:
m1.small:
m1.large:
m1.xlarge:
sa-east-1:
region_name: sa-east-1
access_key_id:
secret_access_key:
capacity:
m1.small:
m1.large:

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

@ -248,19 +248,19 @@ class EC2Driver
conn_opts = get_connect_info(host)
regions = PUBLIC_CLOUD_EC2_CONF['regions']
regions["default"]["access_key_id"] = conn_opts[:access]
regions["default"]["secret_access_key"] = conn_opts[:secret]
access_key = conn_opts[:access]
secret_key = conn_opts[:secret]
@region = regions[host] || regions["default"]
#sanitize region data
raise "access_key_id not defined for #{host}" if @region['access_key_id'].nil?
raise "secret_access_key not defined for #{host}" if @region['secret_access_key'].nil?
raise "access_key_id not defined for #{host}" if access_key.nil?
raise "secret_access_key not defined for #{host}" if secret_key.nil?
raise "region_name not defined for #{host}" if @region['region_name'].nil?
Aws.config.merge!({
:access_key_id => @region['access_key_id'],
:secret_access_key => @region['secret_access_key'],
:access_key_id => access_key,
:secret_access_key => secret_key,
:region => @region['region_name']
})