Revert configuration sample update from previous commit

The patch Iad73f75694ef21223165e34406830138784c6fc1 made some
wrong changes to our sample. This is because our generator
doesn't work when two options (in different groups)
have the exact same description message.

Change-Id: I1e8aa162a4063e96862958446f19a98758bc61b1

etc/solum/solum.conf.sample

@@ -729,20 +729,12 @@
 # communication with the mistral service. (string value)
 #endpoint_type=publicURL
 
-# Optional CA cert file to use in SSL connections. (string
-# value)
+# Optional CA cert file to use in SSL connections with
+# Mistral. (string value)
 #cacert=<None>
 
-# If set the server certificate will not be verified. (boolean
-# value)
-#insecure=false
-
-# Optional CA cert file to use in SSL connections. (string
-# value)
-#cacert=<None>
-
-# If set the server certificate will not be verified. (boolean
-# value)
+# If set the server certificate will not be verified while
+# using Mistral. (boolean value)
 #insecure=false
 
 
@@ -775,6 +767,14 @@
 # communication with the Swift service. (string value)
 #endpoint_type=publicURL
 
+# Optional CA cert file to use in SSL connections. (string
+# value)
+#cacert=<None>
+
+# If set the server certificate will not be verified. (boolean
+# value)
+#insecure=false
+
 
 [worker]
 

solum/common/clients.py

@@ -90,10 +90,12 @@ mistral_client_opts = [
                    'Type of endpoint in Identity service catalog to use '
                    'for communication with the mistral service.')),
     cfg.StrOpt('cacert',
-               help=_('Optional CA cert file to use in SSL connections.')),
+               help=_('Optional CA cert file to use in SSL connections '
+                      'with Mistral.')),
     cfg.BoolOpt('insecure',
                 default=False,
-                help=_("If set the server certificate will not be verified."))]
+                help=_("If set the server certificate will not be verified "
+                       "while using Mistral."))]
 
 cfg.CONF.register_opts(glance_client_opts, group='glance_client')
 cfg.CONF.register_opts(heat_client_opts, group='heat_client')