From df9862ad302b169e7c587782ab5a7a300e0894d7 Mon Sep 17 00:00:00 2001
From: Javi Fontan <jfontan@opennebula.org>
Date: Thu, 5 Sep 2013 12:27:15 +0200
Subject: [PATCH] feature #2289: add default parameters to ec2 drivers

---
 install.sh                       |  4 +++-
 src/vmm_mad/remotes/ec2/deploy   |  2 +-
 src/vmm_mad/remotes/ec2/ec2.conf | 36 ++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 src/vmm_mad/remotes/ec2/ec2.conf

diff --git a/install.sh b/install.sh
index 87d8467fb3..4debea1e61 100755
--- a/install.sh
+++ b/install.sh
@@ -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
diff --git a/src/vmm_mad/remotes/ec2/deploy b/src/vmm_mad/remotes/ec2/deploy
index 1372e04315..ce0d2e94cd 100755
--- a/src/vmm_mad/remotes/ec2/deploy
+++ b/src/vmm_mad/remotes/ec2/deploy
@@ -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)
 
diff --git a/src/vmm_mad/remotes/ec2/ec2.conf b/src/vmm_mad/remotes/ec2/ec2.conf
new file mode 100644
index 0000000000..a8272d6237
--- /dev/null
+++ b/src/vmm_mad/remotes/ec2/ec2.conf
@@ -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>