From 7b0e2144ee3a3f9e908f9c1a5952a7d33731962d Mon Sep 17 00:00:00 2001
From: esberglu <esberglu@us.ibm.com>
Date: Wed, 13 Jun 2018 11:46:13 -0500
Subject: [PATCH] Powervm configuration cleanup

This cleans up the help text formatting for the powervm conf file to
be consistent throughout the file and consistent with other conf files.

Change-Id: I9ce45fdbebf1ecb5471dffb996d994958412556f
---
 nova/conf/powervm.py | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/nova/conf/powervm.py b/nova/conf/powervm.py
index 50cd6aa8cd9f..7efdbedfb65f 100644
--- a/nova/conf/powervm.py
+++ b/nova/conf/powervm.py
@@ -18,10 +18,10 @@ from oslo_config import cfg
 powervm_group = cfg.OptGroup(
     name="powervm",
     title="PowerVM Options",
-    help="""PowerVM options allow cloud administrators to configure how
-         OpenStack will work with the PowerVM hypervisor.
-         """
-)
+    help="""
+PowerVM options allow cloud administrators to configure how OpenStack will work
+with the PowerVM hypervisor.
+""")
 
 powervm_opts = [
     cfg.FloatOpt(
@@ -29,30 +29,31 @@ powervm_opts = [
         default=0.1,
         min=0.05,
         max=1,
-        help="""Factor used to calculate the amount of physical processor
-             compute power given to each vCPU. E.g. A value of 1.0 means a
-             whole physical processor, whereas 0.05 means 1/20th of a physical
-             processor.
-             """),
+        help="""
+Factor used to calculate the amount of physical processor compute power given
+to each vCPU. E.g. A value of 1.0 means a whole physical processor, whereas
+0.05 means 1/20th of a physical processor.
+"""),
     cfg.StrOpt('disk_driver',
                choices=['localdisk', 'ssp'], ignore_case=True,
                default='localdisk',
-               help="""The disk driver to use for PowerVM disks. PowerVM
-                    provides support for localdisk and PowerVM Shared Storage
-                    Pool disk drivers.
+               help="""
+The disk driver to use for PowerVM disks. PowerVM provides support for
+localdisk and PowerVM Shared Storage Pool disk drivers.
 
-                    Related options:
+Related options:
 
-                    * volume_group_name - required when using localdisk
+* volume_group_name - required when using localdisk
 
-                    """),
+"""),
     cfg.StrOpt('volume_group_name',
                default='',
-               help='Volume Group to use for block device operations. If '
-                    'disk_driver is localdisk, then this attribute must be '
-                    'specified. It is strongly recommended NOT to use '
-                    'rootvg since that is used by the management partition '
-                    'and filling it will cause failures.'),
+               help="""
+Volume Group to use for block device operations. If disk_driver is localdisk,
+then this attribute must be specified. It is strongly recommended NOT to use
+rootvg since that is used by the management partition and filling it will cause
+failures.
+"""),
 ]