From 80c824fb04453daaa41b488d292ffc0342970244 Mon Sep 17 00:00:00 2001 From: Lana Brindley Date: Wed, 17 Feb 2016 16:31:10 +1000 Subject: [PATCH] Add info about root password injection to end user manual As per bug, adding a note about the ability to use password injection. Change-Id: I2df06da8cf07bfbb0273c264fae7901e4884deaa Closes-Bug: #1280092 --- doc/user-guide/source/dashboard_launch_instances.rst | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/user-guide/source/dashboard_launch_instances.rst b/doc/user-guide/source/dashboard_launch_instances.rst index 35756737f5..c3497dfb43 100644 --- a/doc/user-guide/source/dashboard_launch_instances.rst +++ b/doc/user-guide/source/dashboard_launch_instances.rst @@ -192,7 +192,7 @@ When you launch an instance from a volume, note the following steps: Connect to your instance by using SSH ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -To use SSH to connect to your instance, you use the downloaded keypair +To use SSH to connect to your instance, use the downloaded keypair file. .. note:: @@ -210,6 +210,12 @@ file. #. At the prompt, type ``yes``. +It is also possible to SSH into an instance without an SSH keypair, if the +administrator has enabled root password injection. For more information +about root password injection, see `Injecting the administrator password +`_ +in the *OpenStack Cloud Administrator Guide*. + Track usage for instances ~~~~~~~~~~~~~~~~~~~~~~~~~