1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-19 06:50:07 +03:00

feature #2289: add default parameters to ec2 drivers

This commit is contained in:
Javi Fontan 2013-09-05 12:27:15 +02:00
parent 6b16ffabbf
commit df9862ad30
3 changed files with 40 additions and 2 deletions

View File

@ -1170,7 +1170,9 @@ ETC_FILES="share/etc/oned.conf \
src/cli/etc/group.default"
VMWARE_ETC_FILES="src/vmm_mad/remotes/vmware/vmwarerc"
EC2_ETC_FILES="src/vmm_mad/remotes/ec2/ec2rc"
EC2_ETC_FILES="src/vmm_mad/remotes/ec2/ec2rc \
src/vmm_mad/remotes/ec2/ec2.conf"
#-------------------------------------------------------------------------------
# Virtualization drivers config. files, to be installed under $ETC_LOCATION

View File

@ -24,7 +24,7 @@ dfile = ARGV[0]
host = ARGV[1]
id = ARGV[2]
ec2_drv = EC2Driver.new(host)
ec2_drv = EC2Driver.new(ETC_LOCATION+'/ec2.conf')
text=File.read(dfile)

View File

@ -0,0 +1,36 @@
# -------------------------------------------------------------------------- #
# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs #
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
# not use this file except in compliance with the License. You may obtain #
# a copy of the License at #
# #
# http://www.apache.org/licenses/LICENSE-2.0 #
# #
# Unless required by applicable law or agreed to in writing, software #
# distributed under the License is distributed on an "AS IS" BASIS, #
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
# See the License for the specific language governing permissions and #
# limitations under the License. #
#--------------------------------------------------------------------------- #
<!--
Default configuration attributes for the EC2 driver
(all domains will use these values as defaults)
Valid atributes are:
- ec2[keypair,authorizedports,instancetype]
Use XML syntax to specify defaults, note elements are UPCASE
Example:
<TEMPLATE>
<EC2>
<KEYPAIR>gsg-keypair</KEYPAIR>
<AUTHORIZEDPORTS>22</AUTHORIZEDPORTS>
<INSTANCETYPE>m1.small</INSTANCETYPE>
</EC2>
</TEMPLATE>
-->
<TEMPLATE>
<EC2>
<INSTANCETYPE>m1.small</INSTANCETYPE>
</EC2>
</TEMPLATE>