openstack
/
nova
Code Issues Proposed changes

libvirt: add Linux distribution guest only description for inject_xxx options 

Actually, inject_password, inject_key and inject_partition
by libguestfs is only valid for linux guest.
Add some descriptions for these.

TrivialFix

Change-Id: I5b2ef7d677a1d2d47052df5eaf8726cfc02eea1c
Signed-off-by: Chen Hanxiao <chenhx@certusnet.com.cn>
This commit is contained in:
Chen Hanxiao 2017-12-16 10:40:24 +08:00
parent bb3ded3537
commit 95057b0cae
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/admin/admin-password-injection.rst
View File

@ -37,6 +37,10 @@ in ``/etc/nova/nova.conf``:
When enabled, Compute will modify the password of the admin account by editing
the ``/etc/shadow`` file inside the virtual machine instance.
.. note::
Linux distribution guest only.
.. note::
Users can only use :command:`ssh` to access the instance by using the admin

6
nova/conf/libvirt.py
View File

@ -158,6 +158,8 @@ Possible values:
* False (default): Disallows the injection. Any via the REST API provided
admin password will be silently ignored.
*Linux* distribution guest only.
Related options:
* ``inject_partition``: That option will decide about the discovery and usage
@ -180,6 +182,8 @@ This config option will enable directly modifying the instance disk and does
not affect what cloud-init may do using data from config_drive option or the
metadata service.
*Linux* distribution guest only.
Related options:
* ``inject_partition``: That option will decide about the discovery and usage
@ -204,6 +208,8 @@ Possible values:
* 0 => The image is not partitioned
* >0 => The number of the partition to use for the injection
*Linux* distribution guest only.
Related options:
* ``inject_key``: If this option allows the injection of a SSH key it depends