Fix description for [cinder] action_retries option

This fixes a few grammatical issues with the description for
the [cinder] action-retries configuration option.

The ironic.conf.sample file is updated to reflect this change
as well as a couple of other changes from imported packages.

Change-Id: If010d57a518c60b951a20e45c6a6fa3b6f240c76

etc/ironic/ironic.conf.sample

@@ -891,10 +891,10 @@
 # From ironic
 #
 
-# Number of retries in the case of a failed action (only
-# specific actions are retried). This option is part of boot-
-# from-volume work, which is not currently exposed to users.
-# (integer value)
+# 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)
 #action_retries = 3
 
 # Retry interval in seconds in the case of a failed action
@@ -2580,6 +2580,10 @@
 # value)
 #sasl_config_name =
 
+# SASL realm to use if no realm present in username (string
+# value)
+#sasl_default_realm =
+
 # DEPRECATED: User name for message broker authentication
 # (string value)
 # This option is deprecated for removal.
@@ -2805,6 +2809,11 @@
 # Deprecated group/name - [DEFAULT]/notification_topics
 #topics = notifications
 
+# The maximum number of attempts to re-send a notification
+# message which failed to be delivered due to a recoverable
+# error. 0 - No retry, -1 - indefinite (integer value)
+#retry = -1
+
 
 [oslo_messaging_rabbit]
 

ironic/conf/cinder.py

@@ -31,7 +31,7 @@ opts = [
     cfg.IntOpt('action_retries',
                default=3,
                help=_('Number of retries in the case of a failed '
-                      'action (currently only used when deatching'
+                      'action (currently only used when detaching '
                       'volumes). This option is part of boot-from-volume '
                       'work, which is not currently exposed to users.')),
     cfg.IntOpt('action_retry_interval',