diff --git a/heat/engine/resources/openstack/heat/resource_group.py b/heat/engine/resources/openstack/heat/resource_group.py index 3ab12169d4..e2c540f4dd 100644 --- a/heat/engine/resources/openstack/heat/resource_group.py +++ b/heat/engine/resources/openstack/heat/resource_group.py @@ -297,7 +297,7 @@ class ResourceGroup(stack_resource.StackResource): raise exception.StackValidationFailed(message=msg) def _current_blacklist(self): - db_rsrc_names = self.data().get(self.REMOVED_RSRC_LIST) + db_rsrc_names = self.data().get('name_blacklist') if db_rsrc_names: return db_rsrc_names.split(',') else: @@ -578,6 +578,10 @@ class ResourceGroup(stack_resource.StackResource): policy[self.MAX_BATCH_SIZE], policy[self.PAUSE_TIME]) + def _resolve_attribute(self, name): + if name == self.REMOVED_RSRC_LIST: + return self._current_blacklist() + def _update_timeout(self, batch_cnt, pause_sec): total_pause_time = pause_sec * max(batch_cnt - 1, 0) if total_pause_time >= self.stack.timeout_secs(): diff --git a/heat/tests/openstack/heat/test_resource_group.py b/heat/tests/openstack/heat/test_resource_group.py index b6886bea80..d2bd72b16b 100644 --- a/heat/tests/openstack/heat/test_resource_group.py +++ b/heat/tests/openstack/heat/test_resource_group.py @@ -833,7 +833,7 @@ class ResourceGroupAttrTest(common.HeatTestCase): def test_get_attribute_blacklist(self): resg = self._create_dummy_stack() - resg.data = mock.Mock(return_value={resg.REMOVED_RSRC_LIST: '3,5'}) + resg.data = mock.Mock(return_value={'name_blacklist': '3,5'}) expected = ['3', '5'] self.assertEqual(expected, resg.FnGetAtt(resg.REMOVED_RSRC_LIST))