From 685680b8df338c7e71b9cc13594fe8140abf3fc1 Mon Sep 17 00:00:00 2001 From: Vladyslav Drok Date: Fri, 3 Apr 2015 14:34:53 +0300 Subject: [PATCH] Fix help string for glance auth_strategy option Help for Glance auth_strategy config option is incorrect, this change fixes it. Change-Id: I0749477118930794942d8ccb6cfc043d92dc1a62 --- etc/ironic/ironic.conf.sample | 14 ++++++++++++-- ironic/common/image_service.py | 5 +++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index 42d9b40dc1..92dab298c2 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -826,8 +826,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 @@ -1376,6 +1377,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 diff --git a/ironic/common/image_service.py b/ironic/common/image_service.py index 57ab194d75..e4bef4ae3b 100644 --- a/ironic/common/image_service.py +++ b/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')