From 076b3e649e09e87a09ebe9b552597af0f2c02ca0 Mon Sep 17 00:00:00 2001
From: Nguyen Hung Phuong <phuongnh@vn.fujitsu.com>
Date: Mon, 27 Nov 2017 17:44:47 +0700
Subject: [PATCH] Follow up Add additional capabilities discovery for iRMC
 driver

This commit makes changes based upon review feedback
in I1958e18a5b9d933e2aa405b200bac7717f146611.
 - Updates documentation describes required software by python-scciclient
 - Updates release note

Co-authored-By: Tran Ha Tuyen <tuyenth@vn.fujitsu.com>

Related-Bug: #1637422
Change-Id: I1ca1e1e02b8c2102e0dbd858c0a51df0dd6b58fb
---
 doc/source/admin/drivers/irmc.rst                  |  7 ++++---
 ...c-additional-capabilities-4fd72ba50d05676c.yaml | 14 +++++++++-----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/doc/source/admin/drivers/irmc.rst b/doc/source/admin/drivers/irmc.rst
index 4ab9aa4926..ca3bfac554 100644
--- a/doc/source/admin/drivers/irmc.rst
+++ b/doc/source/admin/drivers/irmc.rst
@@ -523,9 +523,10 @@ configuration:
 
     gpu_ids = 0x1000/0x0079,0x2100/0x0080
 
-* It is necessary that pyghmi version >= 1.0.22 and pysnmp version >= 4.2.3
-  are used on the conductor. The latest version of pyghmi can
-  be downloaded from `here <https://pypi.python.org/pypi/pyghmi/>`__
+* The python-scciclient package requires pyghmi version >= 1.0.22 and pysnmp
+  version >= 4.2.3. They are used by the conductor service on the conductor.
+  The latest version of pyghmi can be downloaded from `here
+  <https://pypi.python.org/pypi/pyghmi/>`__
   and pysnmp can be downloaded from `here
   <https://pypi.python.org/pypi/pysnmp/>`__.
 
diff --git a/releasenotes/notes/irmc-additional-capabilities-4fd72ba50d05676c.yaml b/releasenotes/notes/irmc-additional-capabilities-4fd72ba50d05676c.yaml
index a47571e35d..26b73e8305 100644
--- a/releasenotes/notes/irmc-additional-capabilities-4fd72ba50d05676c.yaml
+++ b/releasenotes/notes/irmc-additional-capabilities-4fd72ba50d05676c.yaml
@@ -1,9 +1,13 @@
 ---
 features:
   - |
-    Adds new capabilities ("server_model", "rom_firmware_version", "pci_gpu_devices",
-    "trusted_boot" and "irmc_firmware_version") to the iRMC out-of-band hardware inspection
+    Adds new capabilities (``server_model``, ``rom_firmware_version``, ``pci_gpu_devices``,
+    ``trusted_boot`` and ``irmc_firmware_version``) to the iRMC out-of-band hardware inspection
     for FUJITSU PRIMERGY bare metal nodes with firmware iRMC S4 and beyond.
-    Before inspecting, if a server is power-off, it will be turned on automatically.
-    System will wait for a few second before start inspecting. After inspection,
-    power status will be restored to the previous state.
+    Before inspecting, if a server is powered off, it will be turned on automatically.
+    After inspection, power status will be restored to the previous state.
+upgrade:
+  - |
+    Update of python-scciclient to version 0.6.0 is required by the iRMC driver to support
+    new out-of-band inspection capabilities. If the version is not updated, the new
+    capabilities will not be updated.