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

Oca installer

git-svn-id: http://svn.opennebula.org/one/trunk@710 3034c82b-c49b-4eb3-8279-a7acafdc01c0
This commit is contained in:
Javier Fontán Muiños 2009-07-21 14:56:35 +00:00
parent 7212278256
commit 635c79ad9d
2 changed files with 44 additions and 15 deletions

View File

@ -124,7 +124,8 @@ ETC_DIRS="$ETC_LOCATION/im_kvm \
$ETC_LOCATION/tm_nfs \
$ETC_LOCATION/tm_ssh \
$ETC_LOCATION/tm_dummy \
$ETC_LOCATION/hm"
$ETC_LOCATION/hm \
$ETC_LOCATION/ec2query_templates"
LIB_DIRS="$LIB_LOCATION/im_probes \
$LIB_LOCATION/ruby \
@ -156,6 +157,8 @@ INSTALL_FILES[9]="DUMMY_TM_COMMANDS_LIB_FILES:$LIB_LOCATION/tm_commands/dummy"
INSTALL_FILES[10]="EXAMPLE_SHARE_FILES:$SHARE_LOCATION/examples"
INSTALL_FILES[11]="TM_EXAMPLE_SHARE_FILES:$SHARE_LOCATION/examples/tm"
INSTALL_FILES[12]="HOOK_SHARE_FILES:$SHARE_LOCATION/hooks"
INSTALL_FILES[13]="OCA_LIB_FILES:$LIB_LOCATION/ruby"
INSTALL_FILES[14]="OCA_BIN_FILES:$BIN_LOCATION"
INSTALL_ETC_FILES[0]="ETC_FILES:$ETC_LOCATION"
INSTALL_ETC_FILES[1]="VMM_XEN_ETC_FILES:$ETC_LOCATION/vmm_xen"
@ -170,6 +173,8 @@ INSTALL_ETC_FILES[9]="TM_NFS_ETC_FILES:$ETC_LOCATION/tm_nfs"
INSTALL_ETC_FILES[10]="TM_SSH_ETC_FILES:$ETC_LOCATION/tm_ssh"
INSTALL_ETC_FILES[11]="TM_DUMMY_ETC_FILES:$ETC_LOCATION/tm_dummy"
INSTALL_ETC_FILES[12]="HM_ETC_FILES:$ETC_LOCATION/hm"
INSTALL_ETC_FILES[13]="OCA_ETC_FILES:$ETC_LOCATION"
INSTALL_ETC_FILES[14]="OCA_TEMPLATE_FILES:$ETC_LOCATION/ec2query_templates"
#-------------------------------------------------------------------------------
# Binary files, to be installed under $BIN_LOCATION
@ -374,6 +379,21 @@ TM_EXAMPLE_SHARE_FILES="share/examples/tm/tm_clone.sh \
HOOK_SHARE_FILES="share/hooks/ebtables-xen"
#-------------------------------------------------------------------------------
# OCA files
#-------------------------------------------------------------------------------
OCA_LIB_FILES="src/oca/rm/image.rb \
src/oca/rm/repo_manager.rb \
src/oca/ec2/OcaConfiguration.rb"
OCA_BIN_FILES="src/oca/ec2/eco.rb"
OCA_ETC_FILES="src/oca/ec2/oca.conf"
OCA_TEMPLATE_FILES="src/oca/ec2/templates/m1.small.erb"
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
# INSTALL.SH SCRIPT

View File

@ -2,6 +2,7 @@
require 'rubygems'
require 'sinatra'
require 'EC2'
require 'time'
$: << './OpenNebulaApi'
$: << './lib'
@ -98,6 +99,11 @@ def render_state(vm)
<name>#{ec2_state[:name]}</name>"
end
def render_launch_time(vm)
pp vm[:stime]
"<launchTime>#{Time.at(vm[:stime].to_i).xmlschema}</launchTime>"
end
def authenticate(params)
user_name=params['AWSAccessKeyId']
user=get_user(user_name)
@ -163,7 +169,10 @@ def run_instances(params)
pp response
vm.info
@vm_info[:vm_id]=vm.id
@vm_info[:vm]=vm
erb :run_instances
end
@ -174,6 +183,8 @@ def describe_instances(params)
@vmpool=VirtualMachinePool.new(get_one_client)
@vmpool.info
pp @vmpool
erb :describe_instances
end
@ -238,12 +249,12 @@ __END__
</instanceState>
<privateDnsName></privateDnsName>
<dnsName></dnsName>
<keyName>example-key-name</keyName>
<keyName>default</keyName>
<amiLaunchIndex>0</amiLaunchIndex>
<instanceType>m1.small</instanceType>
<launchTime>2007-08-07T11:51:50.000Z</launchTime>
<instanceType><%= @vm[:instance_type] %></instanceType>
<%= render_launch_time(@vm_info[:vm]) %>
<placement>
<availabilityZone>us-east-1b</availabilityZone>
<availabilityZone>default</availabilityZone>
</placement>
<monitoring>
<enabled>true</enabled>
@ -265,23 +276,21 @@ __END__
</groupSet>
<instancesSet>
<% @vmpool.each do |vm| %>
<% vm.info %>
<item>
<instanceId><%= vm.id %></instanceId>
<imageId><%= vm.id %></imageId>
<instanceState>
<%= render_state(vm) %>
</instanceState>
<privateDnsName>10-251-50-132.ec2.internal</privateDnsName>
<dnsName>ec2-72-44-33-4.compute-1.amazonaws.com</dnsName>
<keyName>example-key-name</keyName>
<amiLaunchIndex>23</amiLaunchIndex>
<productCodesSet>
<item><productCode>774F4FF8</productCode></item>
</productCodesSet>
<instanceType>m1.large</instanceType>
<launchTime>2007-08-07T11:54:42.000Z</launchTime>
<privateDnsName>10.0.0.1</privateDnsName>
<dnsName>10.0.0.1</dnsName>
<keyName>default</keyName>
<amiLaunchIndex>1</amiLaunchIndex>
<instanceType><%= vm['TEMPLATE/INSTANCE_TYPE'] %></instanceType>
<%= render_launch_time(vm) %>
<placement>
<availabilityZone>us-east-1b</availabilityZone>
<availabilityZone>default</availabilityZone>
</placement>
</item>
<% end %>