From b709f5e9097e439d49821eb862a8c2f2b2a67c9d Mon Sep 17 00:00:00 2001
From: Hironori Shiina <shiina.hironori@jp.fujitsu.com>
Date: Mon, 30 Oct 2017 15:31:04 +0900
Subject: [PATCH] Remove unnesessary description for config parameters in
 cinder group

Now that the BFV implementation with iPXE was completed, the
parameters in [cinder] group can be exposed. This patch fixes the help
messages.

Change-Id: I9f20d478334901140f7c1639d8f0bb0612ae5de0
Related-Bug: #1559691
---
 etc/ironic/ironic.conf.sample | 11 +++--------
 ironic/conf/cinder.py         | 10 +++-------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample
index c6365ab8b8..030d1c493f 100644
--- a/etc/ironic/ironic.conf.sample
+++ b/etc/ironic/ironic.conf.sample
@@ -907,9 +907,7 @@
 #
 
 # Number of retries in the case of a failed action (currently
-# only used when detaching volumes). This option is part of
-# boot-from-volume work, which is not currently exposed to
-# users. (integer value)
+# only used when detaching volumes). (integer value)
 #action_retries = 3
 
 # Retry interval in seconds in the case of a failed action
@@ -970,8 +968,7 @@
 #project_name = <None>
 
 # Client retries in the case of a failed request connection.
-# This option is part of boot-from-volume work, which is not
-# currently exposed to users. (integer value)
+# (integer value)
 #retries = 3
 
 # Tenant ID (string value)
@@ -987,9 +984,7 @@
 #trust_id = <None>
 
 # URL for connecting to cinder. If set, the value must start
-# with either http:// or https://. This option is part of
-# boot-from-volume work, which is not currently exposed to
-# users. (uri value)
+# with either http:// or https://. (uri value)
 #url = <None>
 
 # User's domain id (string value)
diff --git a/ironic/conf/cinder.py b/ironic/conf/cinder.py
index 71ee9491de..4cb79bc59b 100644
--- a/ironic/conf/cinder.py
+++ b/ironic/conf/cinder.py
@@ -20,20 +20,16 @@ opts = [
     cfg.URIOpt('url',
                schemes=('http', 'https'),
                help=_('URL for connecting to cinder. If set, the value must '
-                      'start with either http:// or https://. This option is '
-                      'part of boot-from-volume work, which is not currently '
-                      'exposed to users.')),
+                      'start with either http:// or https://.')),
     cfg.IntOpt('retries',
                default=3,
                help=_('Client retries in the case of a failed request '
-                      'connection. This option is part of boot-from-volume '
-                      'work, which is not currently exposed to users.')),
+                      'connection.')),
     cfg.IntOpt('action_retries',
                default=3,
                help=_('Number of retries in the case of a failed '
                       'action (currently only used when detaching '
-                      'volumes). This option is part of boot-from-volume '
-                      'work, which is not currently exposed to users.')),
+                      'volumes).')),
     cfg.IntOpt('action_retry_interval',
                default=5,
                help=_('Retry interval in seconds in the case of a failed '