openstack/ironic
Code Issues Proposed changes

Merge "Fix help string for glance auth_strategy option"

Browse Source
This commit is contained in:
Jenkins 2015-04-07 18:32:17 +00:00 committed by Gerrit Code Review
commit 65223fc6ed
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
etc/ironic/ironic.conf.sample
View File

@ -824,8 +824,9 @@
# (integer value) # (integer value)
#glance_num_retries=0 #glance_num_retries=0
# Default protocol to use when connecting to glance. Set to # Authentication strategy to use when connecting to glance.
# https for SSL. (string value) # Only "keystone" and "noauth" are currently supported by
# ironic. (string value)
#auth_strategy=keystone #auth_strategy=keystone
@ -1374,6 +1375,15 @@
# value) # value)
#rabbit_ha_queues=false #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 # Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake
# (boolean value) # (boolean value)
#fake_rabbit=false #fake_rabbit=false

5
ironic/common/image_service.py
View File

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