From 95057b0cae66f47de715d8803936c65bf1d7d1b8 Mon Sep 17 00:00:00 2001 From: Chen Hanxiao Date: Sat, 16 Dec 2017 10:40:24 +0800 Subject: [PATCH] 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 --- doc/source/admin/admin-password-injection.rst | 4 ++++ nova/conf/libvirt.py | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/doc/source/admin/admin-password-injection.rst b/doc/source/admin/admin-password-injection.rst index d5d6bab0697c..dbd0081da9d5 100644 --- a/doc/source/admin/admin-password-injection.rst +++ b/doc/source/admin/admin-password-injection.rst @@ -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 diff --git a/nova/conf/libvirt.py b/nova/conf/libvirt.py index b1339faa8020..e8aee6b3842a 100644 --- a/nova/conf/libvirt.py +++ b/nova/conf/libvirt.py @@ -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