Commit 52469de0 authored by Klaus Aehlig's avatar Klaus Aehlig

Merge branch 'stable-2.8' into stable-2.9

* stable-2.8
  Add a default to file-driver when unspecified over RAPI
  Remove typo from RAPI documentation
  Describe the files in doc/users in NEWS
  Update the upgrade procedure

* stable-2.7
  Fix incorrect manpage reference to htools

Conflicts:
	NEWS
	configure.ac
	lib/cmdlib/instance.py
	man/hroller.rst

All trivial, except for man/hrooler.rst, where the
fix in the section number was manually applied to the
new text.
Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
Reviewed-by: default avatarThomas Thrainer <thomasth@google.com>
parents b2e7599d a3de343e
......@@ -67,10 +67,10 @@ Python
for the unit tests (and only used for testing).
Version 2.8.0 rc2
Version 2.8.0 rc3
-----------------
*(Released Tue, 27 Aug 2013)*
*(Released Tue, 17 Sep 2013)*
Incompatible/important changes
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......@@ -138,6 +138,15 @@ New features
failures.
- Support 'viridian' parameter in Xen HVM
- Support DSA SSH keys in bootstrap
- To simplify the work of packaging frameworks that want to add the needed users
and groups in a split-user setup themselves, at build time three files in
``doc/users`` will be generated. The ``groups`` files contains, one per line,
the groups to be generated, the ``users`` file contains, one per line, the
users to be generated, optionally followed by their primary group, where
important. The ``groupmemberships`` file contains, one per line, additional
user-group membership relations that need to be established. The syntax of
these files will remain stable in all future versions.
New dependencies
~~~~~~~~~~~~~~~~
......@@ -151,9 +160,30 @@ For Python:
- The minimum Python version needed to run Ganeti is now 2.6.
- ``yaml`` library (only for running the QA).
Since 2.8.0 rc1
Since 2.8.0 rc2
~~~~~~~~~~~~~~~
- To simplify the work of packaging frameworks that want to add the needed users
and groups in a split-user setup themselves, at build time three files in
``doc/users`` will be generated. The ``groups`` files contains, one per line,
the groups to be generated, the ``users`` file contains, one per line, the
users to be generated, optionally followed by their primary group, where
important. The ``groupmemberships`` file contains, one per line, additional
user-group membership relations that need to be established. The syntax of
these files will remain stable in all future versions.
- Add a default to file-driver when unspecified over RAPI (Issue 571)
- Mark the DSA host pubkey as optional, and remove it during config downgrade
(Issue 560)
- Some documentation fixes
Version 2.8.0 rc2
-----------------
*(Released Tue, 27 Aug 2013)*
The second release candidate of the 2.8 series. Since 2.8.0. rc1:
- Support 'viridian' parameter in Xen HVM (Issue 233)
- Include VCS version in ``gnt-cluster version``
- Support DSA SSH keys in bootstrap (Issue 338)
......
......@@ -60,6 +60,9 @@ To run commands on all nodes, the `distributed shell (dsh)
$ /usr/lib/ganeti/tools/users-setup
This will ask for confirmation. To execute directly, add the ``--yes-do-it``
option.
#. Restart daemons on all nodes::
$ /etc/init.d/ganeti restart
......
......@@ -96,7 +96,7 @@ by using the standard HTTP basic access authentication. This means that
for accessing the protected URL ``https://cluster.example.com/resource``,
the address ``https://username:password@cluster.example.com/resource`` should
be used instead.
be used instead. Alternatively, the appropriate parameter of your HTTP client
Alternatively, the appropriate parameter of your HTTP client
(such as ``-u`` for ``curl``) can be used.
.. [#pwhash] Using the MD5 hash of username, realm and password is
......
......@@ -893,7 +893,7 @@ FILESTORE_DIR_OPT = cli_option("--file-storage-dir", dest="file_storage_dir",
FILESTORE_DRIVER_OPT = cli_option("--file-driver", dest="file_driver",
help="Driver to use for image files",
default="loop", metavar="<DRIVER>",
default=None, metavar="<DRIVER>",
choices=list(constants.FILE_DRIVER))
IALLOCATOR_OPT = cli_option("-I", "--iallocator", metavar="<NAME>",
......
......@@ -420,6 +420,17 @@ class LUInstanceCreate(LogicalUnit):
raise errors.OpPrereqError("Invalid file driver name '%s'" %
self.op.file_driver, errors.ECODE_INVAL)
# set default file_driver if unset and required
if (not self.op.file_driver and
self.op.disk_template in [constants.DT_FILE,
constants.DT_SHARED_FILE]):
self.op.file_driver = constants.FD_LOOP
if self.op.disk_template == constants.DT_FILE:
opcodes.RequireFileStorage()
elif self.op.disk_template == constants.DT_SHARED_FILE:
opcodes.RequireSharedFileStorage()
### Node/iallocator related checks
CheckIAllocatorOrNode(self, "iallocator", "pnode")
......
......@@ -65,7 +65,7 @@ OPTIONS
to simulate rebalancing.
For a detailed description about the options listed above have a look at
**htools**\(7), **hspace**\(1) and **hbal**\(1).
**htools**\(1), **hspace**\(1) and **hbal**\(1).
.. vim: set textwidth=72 :
.. Local Variables:
......
......@@ -43,7 +43,7 @@ OPTIONS
-------
For a detailed description about the options listed above have a look at
**htools**\(7) and **hbal**\(1).
**htools**\(1) and **hbal**\(1).
.. vim: set textwidth=72 :
.. Local Variables:
......
......@@ -65,7 +65,7 @@ secondary nodes, and it is safe to reboot them simultaneously.
OPTIONS
-------
For a description of the standard options check **htools**\(7) and
For a description of the standard options check **htools**\(1) and
**hbal**\(1).
\--force
......@@ -100,7 +100,6 @@ For a description of the standard options check **htools**\(7) and
that after each reboot group, all instances are moved back to their
initial position.
BUGS
----
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment