shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

feature #2289: Rename ec2.conf (ec2_driver.default) and hybrid_ec2.conf (ec2_driver.conf)

Browse Source
This commit is contained in:
Daniel Molina 2013-10-16 17:37:11 +02:00
parent 359e974f83
commit 2a77c2a5d9
5 changed files with 4 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/im_mad/im_exec/one_im_sh_ec2
View File

@ -1,35 +0,0 @@
#!/bin/bash
# -------------------------------------------------------------------------- #
# 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. #
#--------------------------------------------------------------------------- #
if [ -z "${ONE_LOCATION}" ]; then
MAD_LOCATION=/usr/lib/one/mads
else
MAD_LOCATION=$ONE_LOCATION/lib/mads
fi
while getopts ":u:r:t:c" opt $@; do
case "${opt}" in
u)
export EC2_REGION="${OPTARG}"
;;
*)
;;
esac
done
exec $MAD_LOCATION/one_im_sh $*

35
src/vmm_mad/exec/one_vmm_sh_ec2
View File

@ -1,35 +0,0 @@
#!/bin/bash
# -------------------------------------------------------------------------- #
# 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. #
#--------------------------------------------------------------------------- #
if [ -z "${ONE_LOCATION}" ]; then
MAD_LOCATION=/usr/lib/one/mads
else
MAD_LOCATION=$ONE_LOCATION/lib/mads
fi
while getopts ":u:r:t:l:s:" opt $@; do
case "${opt}" in
u)
export EC2_REGION="${OPTARG}"
;;
*)
;;
esac
done
exec $MAD_LOCATION/one_vmm_sh $*

0
src/vmm_mad/remotes/ec2/hybrid_ec2.conf → src/vmm_mad/remotes/ec2/ec2_driver.conf
View File

8
src/vmm_mad/remotes/ec2/ec2.conf → src/vmm_mad/remotes/ec2/ec2_driver.default
View File

@ -16,19 +16,19 @@
<!--
Default configuration attributes for the EC2 driver
(all domains will use these values as defaults)
Valid atributes are:
- ec2[keypair,authorizedports,instancetype]
Valid atributes are: AKI AMI CLIENTTOKEN INSTANCETYPE KEYPAIR LICENSEPOOL
PLACEMENTGROUP PRIVATEIP RAMDISK SUBNETID TENANCY USERDATA SECURITYGROUPS
AVAILABILITYZONE EBS_OPTIMIZED ELASTICIP AUTHORIZEDPORTS TAGS
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>

41
src/vmm_mad/remotes/ec2/ec2rc
View File

@ -1,41 +0,0 @@
# -------------------------------------------------------------------------- #
# 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. #
#--------------------------------------------------------------------------- #
# May be needed in some setups
#CLASSPATH: ""
#JAVA_HOME: ""
#----------------------------------------------------------------------------
# EC2 API TOOLS Configuration.
#----------------------------------------------------------------------------
#EC2_HOME: "<path_to_ec2_utils>"
#EC2_PRIVATE_KEY: "<path_to_your_ec2_pem_key>"
#EC2_CERT: "<path_to_your_ec2_pem_cert>"
#----------------------------------------------------------------------------
# Driver configuration
#----------------------------------------------------------------------------
# Arguments for the JAVA Virtual Machine
EC2_JVM_ARGS: "-Xms16m -Xmx64m"
#----------------------------------------------------------------------------
# Max number of instances that can be launched into EC2
#----------------------------------------------------------------------------
SMALL_INSTANCES: 5
LARGE_INSTANCES: 0
EXTRALARGE_INSTANCES: 0