diff --git a/doc/source/admin/report.txt b/doc/source/admin/report.txt index bbf0838b99..bd10378b0e 100644 --- a/doc/source/admin/report.txt +++ b/doc/source/admin/report.txt @@ -285,7 +285,6 @@ default: force_raw_images = True graceful_shutdown_timeout = 60 grub_config_template = /opt/stack/ironic/ironic/common/grub_conf.template - hash_distribution_replicas = 1 hash_partition_exponent = 5 hash_ring_reset_interval = 180 host = ubuntu diff --git a/ironic/conductor/base_manager.py b/ironic/conductor/base_manager.py index 3960688b1f..c08c8702bd 100644 --- a/ironic/conductor/base_manager.py +++ b/ironic/conductor/base_manager.py @@ -427,9 +427,7 @@ class BaseConductorManager(object): except exception.DriverNotFound: return False - return self.host in ring.get_nodes( - node_uuid.encode('utf-8'), - replicas=CONF.hash_distribution_replicas) + return self.host in ring.get_nodes(node_uuid.encode('utf-8')) def _fail_if_in_state(self, context, filters, provision_state, sort_key, callback_method=None, diff --git a/ironic/conductor/rpcapi.py b/ironic/conductor/rpcapi.py index 123bd3d372..0dd36ed2e6 100644 --- a/ironic/conductor/rpcapi.py +++ b/ironic/conductor/rpcapi.py @@ -142,8 +142,7 @@ class ConductorAPI(object): try: ring = self.ring_manager.get_ring(node.driver, node.conductor_group) - dest = ring.get_nodes(node.uuid.encode('utf-8'), - replicas=CONF.hash_distribution_replicas) + dest = ring.get_nodes(node.uuid.encode('utf-8')) return dest.pop() except exception.DriverNotFound: reason = (_('No conductor service registered which supports ' diff --git a/ironic/conf/default.py b/ironic/conf/default.py index 9b2a3c407c..013163fc7c 100644 --- a/ironic/conf/default.py +++ b/ironic/conf/default.py @@ -187,15 +187,6 @@ hash_opts = [ 'smooth in most cases. The default is suitable for up ' 'to a few hundred conductors. Configuring for too many ' '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', default=15, help=_('Time (in seconds) after which the hash ring is ' diff --git a/releasenotes/notes/remove-deprecated-hash_distribution_replicas-08351358eba4c9e1.yaml b/releasenotes/notes/remove-deprecated-hash_distribution_replicas-08351358eba4c9e1.yaml new file mode 100644 index 0000000000..9ce421b57d --- /dev/null +++ b/releasenotes/notes/remove-deprecated-hash_distribution_replicas-08351358eba4c9e1.yaml @@ -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.