Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Hector Sanjuan committed 2011-10-04 11:50:44 +02:00
commit f21bd3b66a
2 files changed
+19 -8

No files matched your search

+13 -2
View File
@@ -9,7 +9,7 @@ distributed data center infrastructures.
Complete documentation can be found at
http://opennebula.org/documentation:rel2.4
http://opennebula.org/documentation:rel3.0
## INSTALLATION
@@ -35,6 +35,14 @@ Additionally, to build OpenNebula from source you need:
* **bison** >= 2.3 (optional, only needed to rebuild the parsers)
* **libxml2-dev**
### RUBY LIBRARIES REQUIREMENTS
A set of gem requirements are needed to make several components work. We
include a handy script to install them and the requirements. It is located at
`share/install_gems/install_gems` and you should use it to install the
required gems. You have more information at:
http://opennebula.org/documentation:rel3.0:compile
### OPTIONAL PACKAGES
@@ -104,6 +112,8 @@ where **install_options** can be one or more of:
-d target installation directory. If defined, it will specified
the path for the self-contained install. If not defined, the
installation will be performed system wide
-c only install client utilities: OpenNebula cli, occi and ec2
client files
-r remove Opennebula, only useful if -d was not specified,
otherwise rm -rf $ONE_LOCATION would do the job
-h prints installer help
@@ -111,7 +121,8 @@ where **install_options** can be one or more of:
## CONFIGURATION
Information on how to configure OpenNebula is located at http://opennebula.org/documentation:rel2.4
Information on how to configure OpenNebula is located at
http://opennebula.org/documentation:rel3.0:cg
## CONTACT
@@ -49,7 +49,7 @@ var create_vdc_tmpl =
<div class="clear"></div>\
<label for="vdc_force_hosts">VDC host sharing:</label>\
<input type="checkbox" name="vdc_force_hosts" id="vdc_force_hosts" />\
<div class="tip">Allows hosts belonging to other VDCs to be re-added to this one. They will appear marked with * in the list.</div>\
<div class="tip">Allows hosts belonging to other VDCs to be re-added to this one. They will appear greyed-out in the lists.</div>\
<div class="clear"></div>\
<label style="margin-left:205px;font-size:0.8em;color:#bbbbbb">Drag & Drop</label>\
<label style="margin-left:195px;font-size:0.8em;color:#bbbbbb">Available / Selected</label>\
@@ -77,7 +77,7 @@ var update_vdc_tmpl =
<div class="clear"></div>\
<label for="vdc_update_force_hosts">VDC host sharing:</label>\
<input type="checkbox" name="vdc_update_force_hosts" id="vdc_update_force_hosts" />\
<div class="tip">Allows hosts belonging to other VDCs to be re-added to this one. They will appear marked with * in the list.</div>\
<div class="tip">Allows hosts belonging to other VDCs to be re-added to this one. They will appear greyed-out in the list.</div>\
<div class="clear"></div>\
<label style="margin-left:205px;font-size:0.8em;color:#bbbbbb">Drag & Drop</label>\
<label style="margin-left:195px;font-size:0.8em;color:#bbbbbb">Available / Current</label>\
@@ -326,7 +326,7 @@ function fillHostList(req, host_list_json){
free = isHostFree(this.HOST.ID,zone_id);
if (force || free){
list+='<li host_id="'+this.HOST.ID+'">'+(free? this.HOST.NAME : this.HOST.NAME+'*')+'</li>';
list+='<li host_id="'+this.HOST.ID+'">'+(free? this.HOST.NAME : '<span style="color:Grey;">'+this.HOST.NAME+'</span>')+'</li>';
}
});
$('div#create_vdc_dialog #vdc_available_hosts_list').html(list);
@@ -367,7 +367,7 @@ function fillUpdateHostList(req, host_list_json){
free = isHostFree(this.HOST.ID,zone_id);
if (force || free){
list+='<li host_id="'+this.HOST.ID+'">'+(free? this.HOST.NAME : this.HOST.NAME+'*')+'</li>';
list+='<li host_id="'+this.HOST.ID+'">'+(free? this.HOST.NAME : '<span style="color:Grey;">'+this.HOST.NAME+'</span>')+'</li>';
}
});
@@ -404,7 +404,7 @@ function setupCreateVDCDialog(){
dialog.dialog({
autoOpen: false,
modal: true,
width: 500
width: 420
});
$('button',dialog).button();
@@ -495,7 +495,7 @@ function setupUpdateVDCDialog(){
dialog.dialog({
autoOpen: false,
modal: true,
width: 500
width: 420
});
$('button',dialog).button();