diff --git a/nova/tests/unit/virt/ironic/test_driver.py b/nova/tests/unit/virt/ironic/test_driver.py index e8f266daf3..e880a41cb6 100644 --- a/nova/tests/unit/virt/ironic/test_driver.py +++ b/nova/tests/unit/virt/ironic/test_driver.py @@ -2659,7 +2659,9 @@ class HashRingTestCase(test.NoDBTestCase): @mock.patch.object(ironic_driver.IronicDriver, '_refresh_hash_ring') def test_hash_ring_refreshed_on_init(self, mock_hr): - ironic_driver.IronicDriver(None) + d = ironic_driver.IronicDriver(None) + self.assertFalse(mock_hr.called) + d.init_host('foo') mock_hr.assert_called_once_with(mock.ANY) @mock.patch.object(hash_ring, 'HashRing') @@ -2718,6 +2720,7 @@ class NodeCacheTestCase(test.NoDBTestCase): super(NodeCacheTestCase, self).setUp() self.driver = ironic_driver.IronicDriver(None) + self.driver.init_host('foo') self.driver.virtapi = fake.FakeVirtAPI() self.ctx = nova_context.get_admin_context() diff --git a/nova/virt/ironic/driver.py b/nova/virt/ironic/driver.py index b4f70d02a1..7e69ceb018 100644 --- a/nova/virt/ironic/driver.py +++ b/nova/virt/ironic/driver.py @@ -152,7 +152,6 @@ class IronicDriver(virt_driver.ComputeDriver): self.node_cache = {} self.node_cache_time = 0 self.servicegroup_api = servicegroup.API() - self._refresh_hash_ring(nova_context.get_admin_context()) self.ironicclient = client_wrapper.IronicClientWrapper() @@ -512,7 +511,7 @@ class IronicDriver(virt_driver.ComputeDriver): :param host: the hostname of the compute host. """ - return + self._refresh_hash_ring(nova_context.get_admin_context()) def _pike_flavor_migration(self, node_uuids): """This code is needed in Pike to prevent problems where an operator