Merge "Fix help string for glance auth_strategy option"

etc/ironic/ironic.conf.sample

@@ -824,8 +824,9 @@
 # (integer value)
 #glance_num_retries=0
 
-# Default protocol to use when connecting to glance. Set to
-# https for SSL. (string value)
+# Authentication strategy to use when connecting to glance.
+# Only "keystone" and "noauth" are currently supported by
+# ironic. (string value)
 #auth_strategy=keystone
 
 
@@ -1374,6 +1375,15 @@
 # value)
 #rabbit_ha_queues=false
 
+# Number of seconds after which the Rabbit broker is
+# considered down if heartbeat's keep-alive fails (0 disable
+# the heartbeat). (integer value)
+#heartbeat_timeout_threshold=60
+
+# How often times during the heartbeat_timeout_threshold we
+# check the heartbeat. (integer value)
+#heartbeat_rate=2
+
 # Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake
 # (boolean value)
 #fake_rabbit=false

ironic/common/image_service.py

@@ -65,8 +65,9 @@ glance_opts = [
                     'glance.'),
     cfg.StrOpt('auth_strategy',
                default='keystone',
-               help='Default protocol to use when connecting to glance. '
-               'Set to https for SSL.'),
+               help='Authentication strategy to use when connecting to '
+                    'glance. Only "keystone" and "noauth" are currently '
+                    'supported by ironic.'),
 ]
 
 CONF.register_opts(glance_opts, group='glance')