Removes hash_distribution_replicas
configuration option
`hash_distribution_replicas` was deprecated in the Stein cycle (12.1.0). Story: #1680160 Task: #30033 Change-Id: Iddc59ed113fb9808f8c8564433475638491be84f
This commit is contained in:
parent
46533ebea2
commit
e9540f5d22
@ -285,7 +285,6 @@ default:
|
|||||||
force_raw_images = True
|
force_raw_images = True
|
||||||
graceful_shutdown_timeout = 60
|
graceful_shutdown_timeout = 60
|
||||||
grub_config_template = /opt/stack/ironic/ironic/common/grub_conf.template
|
grub_config_template = /opt/stack/ironic/ironic/common/grub_conf.template
|
||||||
hash_distribution_replicas = 1
|
|
||||||
hash_partition_exponent = 5
|
hash_partition_exponent = 5
|
||||||
hash_ring_reset_interval = 180
|
hash_ring_reset_interval = 180
|
||||||
host = ubuntu
|
host = ubuntu
|
||||||
|
@ -427,9 +427,7 @@ class BaseConductorManager(object):
|
|||||||
except exception.DriverNotFound:
|
except exception.DriverNotFound:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
return self.host in ring.get_nodes(
|
return self.host in ring.get_nodes(node_uuid.encode('utf-8'))
|
||||||
node_uuid.encode('utf-8'),
|
|
||||||
replicas=CONF.hash_distribution_replicas)
|
|
||||||
|
|
||||||
def _fail_if_in_state(self, context, filters, provision_state,
|
def _fail_if_in_state(self, context, filters, provision_state,
|
||||||
sort_key, callback_method=None,
|
sort_key, callback_method=None,
|
||||||
|
@ -142,8 +142,7 @@ class ConductorAPI(object):
|
|||||||
try:
|
try:
|
||||||
ring = self.ring_manager.get_ring(node.driver,
|
ring = self.ring_manager.get_ring(node.driver,
|
||||||
node.conductor_group)
|
node.conductor_group)
|
||||||
dest = ring.get_nodes(node.uuid.encode('utf-8'),
|
dest = ring.get_nodes(node.uuid.encode('utf-8'))
|
||||||
replicas=CONF.hash_distribution_replicas)
|
|
||||||
return dest.pop()
|
return dest.pop()
|
||||||
except exception.DriverNotFound:
|
except exception.DriverNotFound:
|
||||||
reason = (_('No conductor service registered which supports '
|
reason = (_('No conductor service registered which supports '
|
||||||
|
@ -184,15 +184,6 @@ hash_opts = [
|
|||||||
'smooth in most cases. The default is suitable for up '
|
'smooth in most cases. The default is suitable for up '
|
||||||
'to a few hundred conductors. Configuring for too many '
|
'to a few hundred conductors. Configuring for too many '
|
||||||
'partitions has a negative impact on CPU usage.')),
|
'partitions has a negative impact on CPU usage.')),
|
||||||
cfg.IntOpt('hash_distribution_replicas',
|
|
||||||
default=1,
|
|
||||||
help=_('[Experimental Feature] '
|
|
||||||
'Number of hosts to map onto each hash partition. '
|
|
||||||
'Setting this to more than one will cause additional '
|
|
||||||
'conductor services to prepare deployment environments '
|
|
||||||
'and potentially allow the Ironic cluster to recover '
|
|
||||||
'more quickly if a conductor instance is terminated.'),
|
|
||||||
deprecated_for_removal=True),
|
|
||||||
cfg.IntOpt('hash_ring_reset_interval',
|
cfg.IntOpt('hash_ring_reset_interval',
|
||||||
default=15,
|
default=15,
|
||||||
help=_('Time (in seconds) after which the hash ring is '
|
help=_('Time (in seconds) after which the hash ring is '
|
||||||
|
@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The configuration option ``[DEFAULT]/hash_distribution_replicas`` was
|
||||||
|
deprecated in the Stein cycle. It has been removed
|
||||||
|
and is no longer supported.
|
Loading…
x
Reference in New Issue
Block a user