From db18cbe8297df23cf5afe3f4b4b370b0a1c83abb Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Mon, 5 Dec 2011 17:56:34 +0100 Subject: [PATCH] Bump to version 3.1.80 --- include/Nebula.h | 4 +- share/man/econe-describe-images.1 | 2 +- share/man/econe-describe-instances.1 | 2 +- share/man/econe-register.1 | 2 +- share/man/econe-run-instances.1 | 2 +- share/man/econe-terminate-instances.1 | 2 +- share/man/econe-upload.1 | 2 +- share/man/occi-compute.1 | 2 +- share/man/occi-network.1 | 2 +- share/man/occi-storage.1 | 2 +- share/man/oneacl.1 | 4 +- share/man/onedb.1 | 11 +- share/man/onegroup.1 | 4 +- share/man/onehost.1 | 6 +- share/man/oneimage.1 | 18 ++- share/man/onetemplate.1 | 4 +- share/man/oneuser.1 | 49 ++++++- share/man/onevdc.1 | 179 +------------------------ share/man/onevm.1 | 6 +- share/man/onevnet.1 | 50 ++++++- share/man/onezone.1 | 151 +-------------------- src/cli/one_helper.rb | 2 +- src/cloud/common/CloudClient.rb | 2 +- src/ozones/Server/templates/index.html | 2 +- src/sunstone/views/index.erb | 2 +- 25 files changed, 136 insertions(+), 376 deletions(-) diff --git a/include/Nebula.h b/include/Nebula.h index 1048358887..ef6575cff6 100644 --- a/include/Nebula.h +++ b/include/Nebula.h @@ -228,12 +228,12 @@ public: static string version() { - return "OpenNebula 3.1.0"; + return "OpenNebula 3.1.80"; }; static string db_version() { - return "3.1.0"; + return "3.1.80"; } void start(); diff --git a/share/man/econe-describe-images.1 b/share/man/econe-describe-images.1 index 975ca7f8fd..2b5bb362c8 100644 --- a/share/man/econe-describe-images.1 +++ b/share/man/econe-describe-images.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH OPENNEBULA "1" "September 2011" "OpenNebula 3.0.0" "User Commands" +.TH OPENNEBULA "1" "December 2011" "OpenNebula 3.1.80" "User Commands" .SH NAME OpenNebula \- OpenNebula econe-describe-images .SH SYNOPSIS diff --git a/share/man/econe-describe-instances.1 b/share/man/econe-describe-instances.1 index ec9e972991..514180ea31 100644 --- a/share/man/econe-describe-instances.1 +++ b/share/man/econe-describe-instances.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH OPENNEBULA "1" "September 2011" "OpenNebula 3.0.0" "User Commands" +.TH OPENNEBULA "1" "December 2011" "OpenNebula 3.1.80" "User Commands" .SH NAME OpenNebula \- OpenNebula econe-describe-instances .SH SYNOPSIS diff --git a/share/man/econe-register.1 b/share/man/econe-register.1 index 1db1a75d02..2f542b3901 100644 --- a/share/man/econe-register.1 +++ b/share/man/econe-register.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH OPENNEBULA "1" "September 2011" "OpenNebula 3.0.0" "User Commands" +.TH OPENNEBULA "1" "December 2011" "OpenNebula 3.1.80" "User Commands" .SH NAME OpenNebula \- OpenNebula econe-register .SH SYNOPSIS diff --git a/share/man/econe-run-instances.1 b/share/man/econe-run-instances.1 index 92ab73a6d2..01695748dc 100644 --- a/share/man/econe-run-instances.1 +++ b/share/man/econe-run-instances.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH OPENNEBULA "1" "September 2011" "OpenNebula 3.0.0" "User Commands" +.TH OPENNEBULA "1" "December 2011" "OpenNebula 3.1.80" "User Commands" .SH NAME OpenNebula \- OpenNebula econe-run-instances .SH SYNOPSIS diff --git a/share/man/econe-terminate-instances.1 b/share/man/econe-terminate-instances.1 index f39fb6b867..e74a983734 100644 --- a/share/man/econe-terminate-instances.1 +++ b/share/man/econe-terminate-instances.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH OPENNEBULA "1" "September 2011" "OpenNebula 3.0.0" "User Commands" +.TH OPENNEBULA "1" "December 2011" "OpenNebula 3.1.80" "User Commands" .SH NAME OpenNebula \- OpenNebula econe-terminate-instances .SH SYNOPSIS diff --git a/share/man/econe-upload.1 b/share/man/econe-upload.1 index 10239bc1d3..424f0ab75c 100644 --- a/share/man/econe-upload.1 +++ b/share/man/econe-upload.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH OPENNEBULA "1" "September 2011" "OpenNebula 3.0.0" "User Commands" +.TH OPENNEBULA "1" "September 2011" "OpenNebula 3.1.80" "User Commands" .SH NAME OpenNebula \- OpenNebula econe-upload .SH SYNOPSIS diff --git a/share/man/occi-compute.1 b/share/man/occi-compute.1 index 7e2276bb51..b4d112e9e6 100644 --- a/share/man/occi-compute.1 +++ b/share/man/occi-compute.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH OPENNEBULA "1" "September 2011" "OpenNebula 3.0.0" "User Commands" +.TH OPENNEBULA "1" "December 2011" "OpenNebula 3.1.80" "User Commands" .SH NAME OpenNebula \- OpenNebula occi-compute .SH SYNOPSIS diff --git a/share/man/occi-network.1 b/share/man/occi-network.1 index 21ae49696c..e63a1659ea 100644 --- a/share/man/occi-network.1 +++ b/share/man/occi-network.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH OPENNEBULA "1" "September 2011" "OpenNebula 3.0.0" "User Commands" +.TH OPENNEBULA "1" "December 2011" "OpenNebula 3.1.80" "User Commands" .SH NAME OpenNebula \- OpenNebula occi-network .SH SYNOPSIS diff --git a/share/man/occi-storage.1 b/share/man/occi-storage.1 index e63697e535..5c6b6865f1 100644 --- a/share/man/occi-storage.1 +++ b/share/man/occi-storage.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH OPENNEBULA "1" "September 2011" "OpenNebula 3.0.0" "User Commands" +.TH OPENNEBULA "1" "December 2011" "OpenNebula 3.1.80" "User Commands" .SH NAME OpenNebula \- OpenNebula occi-storage .SH SYNOPSIS diff --git a/share/man/oneacl.1 b/share/man/oneacl.1 index 874513861c..56635977c5 100644 --- a/share/man/oneacl.1 +++ b/share/man/oneacl.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONEACL" "1" "September 2011" "" "oneacl(1) -- manages OpenNebula ACLs" +.TH "ONEACL" "1" "December 2011" "" "oneacl(1) -- manages OpenNebula ACLs" . .SH "NAME" \fBoneacl\fR @@ -128,7 +128,7 @@ Comma\-separated list of OpenNebula ACL names or ids .IP "" 0 . .SH "LICENSE" -OpenNebula 3\.0\.0 Copyright 2002\-2011, OpenNebula Project Leads (OpenNebula\.org) +OpenNebula 3\.1\.80 Copyright 2002\-2011, OpenNebula Project Leads (OpenNebula\.org) . .P 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 diff --git a/share/man/onedb.1 b/share/man/onedb.1 index 91683af3ab..2c0bc12d35 100644 --- a/share/man/onedb.1 +++ b/share/man/onedb.1 @@ -1,21 +1,12 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONEDB" "1" "September 2011" "" "onedb(1) -- OpenNebula database migration tool" +.TH "ONEDB" "1" "December 2011" "" "onedb(1) -- OpenNebula database migration tool" . .SH "NAME" \fBonedb\fR . .P -DB Connection options: -. -.P -By default, onedb reads the connection data from oned\.conf If any of these options is set, oned\.conf is ignored (i\.e\. if you set MySQL\'s port onedb won\'t look for the rest of the options in oned\.conf) -. -.P -Description: -. -.P This command enables the user to manage the OpenNebula database\. It provides information about the DB version, means to upgrade it to the latest version, and backup tools\. . .SH "OPTIONS" diff --git a/share/man/onegroup.1 b/share/man/onegroup.1 index 32bf32f9be..7434605887 100644 --- a/share/man/onegroup.1 +++ b/share/man/onegroup.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONEGROUP" "1" "September 2011" "" "onegroup(1) -- manages OpenNebula groups" +.TH "ONEGROUP" "1" "December 2011" "" "onegroup(1) -- manages OpenNebula groups" . .SH "NAME" \fBonegroup\fR @@ -160,7 +160,7 @@ Comma\-separated list of OpenNebula GROUP names or ids .IP "" 0 . .SH "LICENSE" -OpenNebula 3\.0\.0 Copyright 2002\-2011, OpenNebula Project Leads (OpenNebula\.org) +OpenNebula 3\.1\.80 Copyright 2002\-2011, OpenNebula Project Leads (OpenNebula\.org) . .P 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 diff --git a/share/man/onehost.1 b/share/man/onehost.1 index 0082e1339f..bc2f1d15e2 100644 --- a/share/man/onehost.1 +++ b/share/man/onehost.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONEHOST" "1" "September 2011" "" "onehost(1) -- manages OpenNebula hosts" +.TH "ONEHOST" "1" "December 2011" "" "onehost(1) -- manages OpenNebula hosts" . .SH "NAME" \fBonehost\fR @@ -27,7 +27,7 @@ .SH "COMMANDS" . .IP "\(bu" 4 -create \fIhostname\fR \fIim_mad\fR \fIvmm_mad\fR \fItm_mad\fR +create \fIhostname\fR \fIim_mad\fR \fIvmm_mad\fR \fItm_mad\fR \fIvnm_mad\fR . .IP "" 4 . @@ -234,7 +234,7 @@ Comma\-separated list of OpenNebula HOST names or ids .IP "" 0 . .SH "LICENSE" -OpenNebula 3\.0\.0 Copyright 2002\-2011, OpenNebula Project Leads (OpenNebula\.org) +OpenNebula 3\.1\.80 Copyright 2002\-2011, OpenNebula Project Leads (OpenNebula\.org) . .P 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 diff --git a/share/man/oneimage.1 b/share/man/oneimage.1 index b100089273..f984ee317f 100644 --- a/share/man/oneimage.1 +++ b/share/man/oneimage.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONEIMAGE" "1" "September 2011" "" "oneimage(1) -- manages OpenNebula images" +.TH "ONEIMAGE" "1" "December 2011" "" "oneimage(1) -- manages OpenNebula images" . .SH "NAME" \fBoneimage\fR @@ -141,6 +141,20 @@ Enables the given Image . .IP "" 0 +. +.IP "\(bu" 4 +chtype \fIrange|imageid_list\fR \fItype\fR +. +.IP "" 4 +. +.nf + +Changes the Image\'s type +. +.fi +. +.IP "" 0 + . .IP "\(bu" 4 disable \fIrange|imageid_list\fR @@ -353,7 +367,7 @@ user IMAGE of the user identified by the username .IP "" 0 . .SH "LICENSE" -OpenNebula 3\.0\.0 Copyright 2002\-2011, OpenNebula Project Leads (OpenNebula\.org) +OpenNebula 3\.1\.80 Copyright 2002\-2011, OpenNebula Project Leads (OpenNebula\.org) . .P 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 diff --git a/share/man/onetemplate.1 b/share/man/onetemplate.1 index 7a3f23139a..4e7688cad6 100644 --- a/share/man/onetemplate.1 +++ b/share/man/onetemplate.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONETEMPLATE" "1" "September 2011" "" "onetemplate(1) -- manages OpenNebula templates" +.TH "ONETEMPLATE" "1" "December 2011" "" "onetemplate(1) -- manages OpenNebula templates" . .SH "NAME" \fBonetemplate\fR @@ -312,7 +312,7 @@ user VMTEMPLATE of the user identified by the username .IP "" 0 . .SH "LICENSE" -OpenNebula 3\.0\.0 Copyright 2002\-2011, OpenNebula Project Leads (OpenNebula\.org) +OpenNebula 3\.1\.80 Copyright 2002\-2011, OpenNebula Project Leads (OpenNebula\.org) . .P 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 diff --git a/share/man/oneuser.1 b/share/man/oneuser.1 index 8bed68c785..3dc6ea80e4 100644 --- a/share/man/oneuser.1 +++ b/share/man/oneuser.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONEUSER" "1" "September 2011" "" "oneuser(1) -- manages OpenNebula users" +.TH "ONEUSER" "1" "December 2011" "" "oneuser(1) -- manages OpenNebula users" . .SH "NAME" \fBoneuser\fR @@ -14,11 +14,12 @@ .nf \-r, \-\-read\-file Read password from file - \-p, \-\-plain Store plain password + \-\-sha1 The password will be hashed using the sha1 algorithm \-\-ssh SSH Auth system \-\-x509 x509 Auth system for x509 certificates \-k, \-\-key path_to_private_key_pem Path to the Private Key of the User \-c, \-\-cert path_to_user_cert_pem Path to the Certificate of the User + \-\-driver driver Driver to autehnticate this user \-\-x509_proxy x509 Auth system based on x509 proxy certificates \-\-proxy path_to_user_proxy_pem Path to the user proxy certificate \-\-time x Token duration in seconds, defaults to 3600 (1 h) @@ -44,11 +45,25 @@ create \fIusername\fR [\fIpassword\fR] Creates a new User Examples: oneuser create my_user my_password - oneuser create my_user /tmp/mypass \-r + oneuser create my_user \-r /tmp/mypass oneuser create my_user \-\-ssh \-\-key /tmp/id_rsa oneuser create my_user \-\-ssh \-r /tmp/public_key oneuser create my_user \-\-x509 \-\-cert /tmp/my_cert\.pem -valid options: read_file, plain, ssh, x509, key, cert +valid options: read_file, sha1, ssh, x509, key, cert, driver +. +.fi +. +.IP "" 0 + +. +.IP "\(bu" 4 +update \fIuserid\fR +. +.IP "" 4 +. +.nf + +Launches the system editor to modify and update the template contents . .fi . @@ -112,7 +127,7 @@ passwd \fIuserid\fR [\fIpassword\fR] .nf Changes the given User\'s password -valid options: read_file, plain, ssh, x509, key, cert +valid options: read_file, sha1, ssh, x509, key, cert, driver . .fi . @@ -132,6 +147,28 @@ Changes the User\'s main group . .IP "" 0 +. +.IP "\(bu" 4 +chauth \fIuserid\fR [\fIauth\fR] [\fIpassword\fR] +. +.IP "" 4 +. +.nf + +Changes the User\'s auth driver and its password (optional) +Examples: + oneuser chauth my_user core + oneuser chauth my_user core new_password + oneuser chauth my_user core \-r /tmp/mypass + oneuser chauth my_user \-\-ssh \-\-key /home/oneadmin/\.ssh/id_rsa + oneuser chauth my_user \-\-ssh \-r /tmp/public_key + oneuser chauth my_user \-\-x509 \-\-cert /tmp/my_cert\.pem +valid options: read_file, sha1, ssh, x509, key, cert, driver +. +.fi +. +.IP "" 0 + . .IP "\(bu" 4 list @@ -268,7 +305,7 @@ User password .IP "" 0 . .SH "LICENSE" -OpenNebula 3\.0\.0 Copyright 2002\-2011, OpenNebula Project Leads (OpenNebula\.org) +OpenNebula 3\.1\.80 Copyright 2002\-2011, OpenNebula Project Leads (OpenNebula\.org) . .P 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 diff --git a/share/man/onevdc.1 b/share/man/onevdc.1 index c6aa1c9e5a..c0113faa15 100644 --- a/share/man/onevdc.1 +++ b/share/man/onevdc.1 @@ -1,184 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONEVDC" "1" "September 2011" "" "onevdc(1) -- manages OpenNebula Virtual DataCenters" +.TH "ONEVDC" "1" "December 2011" "" "onevdc(1) -- manages OpenNebula Virtual DataCenters" . .SH "NAME" \fBonevdc\fR -. -.SH "SYNOPSIS" -\fBonevdc\fR command [\fIargs\fR] [\fIoptions\fR] -. -.SH "OPTIONS" -. -.nf - - \-f, \-\-force Force the usage of Hosts in more than one VDC - \-l, \-\-list x,y,z Selects columns to display with list command - \-d, \-\-delay x Sets the delay in seconds for top command - \-x, \-\-xml Show the resource in xml format - \-n, \-\-numeric Do not translate user and group IDs - \-k, \-\-kilobytes Show units in kilobytes - \-v, \-\-verbose Verbose mode - \-h, \-\-help Show this message - \-V, \-\-version Show version and copyright information -. -.fi -. -.SH "COMMANDS" -. -.IP "\(bu" 4 -create \fIfile\fR -. -.IP "" 4 -. -.nf - -Create a new VDC -valid options: force -. -.fi -. -.IP "" 0 - -. -.IP "\(bu" 4 -show \fIvdcid\fR -. -.IP "" 4 -. -.nf - -Show information of a particular VDC -. -.fi -. -.IP "" 0 - -. -.IP "\(bu" 4 -list -. -.IP "" 4 -. -.nf - -Lists VDCs in the pool -valid options: list, delay, xml, numeric, kilobytes -. -.fi -. -.IP "" 0 - -. -.IP "\(bu" 4 -delete \fIvdcid\fR -. -.IP "" 4 -. -.nf - -Deletes a VDC -. -.fi -. -.IP "" 0 - -. -.IP "\(bu" 4 -addhost \fIvdcid\fR \fIrange\fR -. -.IP "" 4 -. -.nf - -Adds the set of hosts to the VDC -valid options: force -. -.fi -. -.IP "" 0 - -. -.IP "\(bu" 4 -delhost \fIvdcid\fR \fIrange\fR -. -.IP "" 4 -. -.nf - -Deletes the set of hosts from the VDC -valid options: force -. -.fi -. -.IP "" 0 - -. -.IP "" 0 -. -.SH "ARGUMENT FORMATS" -. -.IP "\(bu" 4 -file -. -.IP "" 4 -. -.nf - -Path to a file -. -.fi -. -.IP "" 0 - -. -.IP "\(bu" 4 -range -. -.IP "" 4 -. -.nf - -List of id\'s in the form 1,8\.\.15 -. -.fi -. -.IP "" 0 - -. -.IP "\(bu" 4 -text -. -.IP "" 4 -. -.nf - -String -. -.fi -. -.IP "" 0 - -. -.IP "\(bu" 4 -vdcid -. -.IP "" 4 -. -.nf - -VDC ID -. -.fi -. -.IP "" 0 - -. -.IP "" 0 -. -.SH "LICENSE" -OpenNebula 3\.0\.0 Copyright 2002\-2011, OpenNebula Project Leads (OpenNebula\.org) -. -.P -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 diff --git a/share/man/onevm.1 b/share/man/onevm.1 index 7ecebedb64..d39165017c 100644 --- a/share/man/onevm.1 +++ b/share/man/onevm.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONEVM" "1" "September 2011" "" "onevm(1) -- manages OpenNebula virtual machines" +.TH "ONEVM" "1" "December 2011" "" "onevm(1) -- manages OpenNebula virtual machines" . .SH "NAME" \fBonevm\fR @@ -17,6 +17,7 @@ \-x, \-\-xml Show the resource in xml format \-n, \-\-numeric Do not translate user and group IDs \-k, \-\-kilobytes Show units in kilobytes + \-t, \-\-type type Type of the new Image \-l, \-\-list x,y,z Selects columns to display with list command \-d, \-\-delay x Sets the delay in seconds for top command \-v, \-\-verbose Verbose mode @@ -106,6 +107,7 @@ shut down gracefuly (i\.e\., using \'onevm shutdown\' and not \'onevm delete\') States: ANY +valid options: type . .fi . @@ -493,7 +495,7 @@ user VM of the user identified by the username .IP "" 0 . .SH "LICENSE" -OpenNebula 3\.0\.0 Copyright 2002\-2011, OpenNebula Project Leads (OpenNebula\.org) +OpenNebula 3\.1\.80 Copyright 2002\-2011, OpenNebula Project Leads (OpenNebula\.org) . .P 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 diff --git a/share/man/onevnet.1 b/share/man/onevnet.1 index 75844a4749..40801443b4 100644 --- a/share/man/onevnet.1 +++ b/share/man/onevnet.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONEVNET" "1" "September 2011" "" "onevnet(1) -- manages OpenNebula networks" +.TH "ONEVNET" "1" "December 2011" "" "onevnet(1) -- manages OpenNebula networks" . .SH "NAME" \fBonevnet\fR @@ -81,6 +81,34 @@ Removes a lease from the Virtual Network . .IP "" 0 +. +.IP "\(bu" 4 +hold \fIvnetid\fR \fIip\fR +. +.IP "" 4 +. +.nf + +Holds a Virtual Network lease, marking it as used +. +.fi +. +.IP "" 0 + +. +.IP "\(bu" 4 +release \fIvnetid\fR \fIip\fR +. +.IP "" 4 +. +.nf + +Releases a Virtual Network lease on hold +. +.fi +. +.IP "" 0 + . .IP "\(bu" 4 publish \fIrange|vnetid_list\fR @@ -113,7 +141,7 @@ can\'t be used by any other User . .IP "\(bu" 4 -chgrp \fIrange|vnid_list\fR \fIgroupid\fR +chgrp \fIrange|vnetid_list\fR \fIgroupid\fR . .IP "" 4 . @@ -127,7 +155,7 @@ Changes the Virtual Network group . .IP "\(bu" 4 -chown \fIrange|vnid_list\fR \fIuserid\fR [\fIgroupid\fR] +chown \fIrange|vnetid_list\fR \fIuserid\fR [\fIgroupid\fR] . .IP "" 4 . @@ -169,6 +197,20 @@ valid options: xml . .IP "" 0 +. +.IP "\(bu" 4 +update \fIvnetid\fR +. +.IP "" 4 +. +.nf + +Launches the system editor to modify and update the template contents +. +.fi +. +.IP "" 0 + . .IP "" 0 . @@ -294,7 +336,7 @@ user VNET of the user identified by the username .IP "" 0 . .SH "LICENSE" -OpenNebula 3\.0\.0 Copyright 2002\-2011, OpenNebula Project Leads (OpenNebula\.org) +OpenNebula 3\.1\.80 Copyright 2002\-2011, OpenNebula Project Leads (OpenNebula\.org) . .P 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 diff --git a/share/man/onezone.1 b/share/man/onezone.1 index f6467d59fd..ca66f3191b 100644 --- a/share/man/onezone.1 +++ b/share/man/onezone.1 @@ -1,156 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONEZONE" "1" "September 2011" "" "onezone(1) -- manages OpenNebula zones" +.TH "ONEZONE" "1" "December 2011" "" "onezone(1) -- manages OpenNebula zones" . .SH "NAME" \fBonezone\fR -. -.SH "SYNOPSIS" -\fBonezone\fR \fIcommand\fR [\fIargs\fR] [\fIoptions\fR] -. -.SH "OPTIONS" -. -.nf - - \-l, \-\-list x,y,z Selects columns to display with list command - \-d, \-\-delay x Sets the delay in seconds for top command - \-x, \-\-xml Show the resource in xml format - \-n, \-\-numeric Do not translate user and group IDs - \-k, \-\-kilobytes Show units in kilobytes - \-v, \-\-verbose Verbose mode - \-h, \-\-help Show this message - \-V, \-\-version Show version and copyright information -. -.fi -. -.SH "COMMANDS" -. -.IP "\(bu" 4 -create \fIfile\fR -. -.IP "" 4 -. -.nf - -Create a new Zone -. -.fi -. -.IP "" 0 - -. -.IP "\(bu" 4 -show \fIzoneid\fR [\fIresource\fR] -. -.IP "" 4 -. -.nf - -Show information of a particular Zone -Available resources: host, vm, image, vn, template, user -Examples: - onezone show 4 - onezone show 4 host -. -.fi -. -.IP "" 0 - -. -.IP "\(bu" 4 -list -. -.IP "" 4 -. -.nf - -Lists Zones in the pool -valid options: list, delay, xml, numeric, kilobytes -. -.fi -. -.IP "" 0 - -. -.IP "\(bu" 4 -delete \fIzoneid\fR -. -.IP "" 4 -. -.nf - -Deletes a Zone -. -.fi -. -.IP "" 0 - -. -.IP "" 0 -. -.SH "ARGUMENT FORMATS" -. -.IP "\(bu" 4 -file -. -.IP "" 4 -. -.nf - -Path to a file -. -.fi -. -.IP "" 0 - -. -.IP "\(bu" 4 -range -. -.IP "" 4 -. -.nf - -List of id\'s in the form 1,8\.\.15 -. -.fi -. -.IP "" 0 - -. -.IP "\(bu" 4 -text -. -.IP "" 4 -. -.nf - -String -. -.fi -. -.IP "" 0 - -. -.IP "\(bu" 4 -zoneid -. -.IP "" 4 -. -.nf - -Zone ID -. -.fi -. -.IP "" 0 - -. -.IP "" 0 -. -.SH "LICENSE" -OpenNebula 3\.0\.0 Copyright 2002\-2011, OpenNebula Project Leads (OpenNebula\.org) -. -.P -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 diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb index 18e684674e..7b542e468f 100644 --- a/src/cli/one_helper.rb +++ b/src/cli/one_helper.rb @@ -21,7 +21,7 @@ include OpenNebula module OpenNebulaHelper ONE_VERSION=<<-EOT -OpenNebula 3.1.0 +OpenNebula 3.1.80 Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org) Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/src/cloud/common/CloudClient.rb b/src/cloud/common/CloudClient.rb index 176471419b..562888917d 100644 --- a/src/cloud/common/CloudClient.rb +++ b/src/cloud/common/CloudClient.rb @@ -173,7 +173,7 @@ module CloudCLI def version_text version=< diff --git a/src/sunstone/views/index.erb b/src/sunstone/views/index.erb index 9140aafa6e..a6f1938409 100644 --- a/src/sunstone/views/index.erb +++ b/src/sunstone/views/index.erb @@ -67,7 +67,7 @@