diff --git a/heat/engine/environment.py b/heat/engine/environment.py index bb75923d1b..4b450bf5e0 100644 --- a/heat/engine/environment.py +++ b/heat/engine/environment.py @@ -262,10 +262,6 @@ class ResourceRegistry(object): 'now': str(info.value)} LOG.warn(_LW('Changing %(path)s from %(was)s to %(now)s'), details) - else: - LOG.info(_LI('Registering %(path)s -> %(value)s'), { - 'path': descriptive_path, - 'value': str(info.value)}) if isinstance(info, ClassResourceInfo): if info.value.support_status.status != support.SUPPORTED: @@ -276,6 +272,15 @@ class ResourceRegistry(object): info.user_resource = (self.global_registry is not None) registry[name] = info + def log_resource_info(self, show_all=False, prefix=None): + registry = self._registry + for name in registry: + if show_all or isinstance(registry[name], TemplateResourceInfo): + msg = (_('%(p)s Registered: %(t)s') % + {'p': prefix or '', + 't': six.text_type(registry[name])}) + LOG.info(msg) + def remove_item(self, info): if not isinstance(info, TemplateResourceInfo): return diff --git a/heat/engine/resources/__init__.py b/heat/engine/resources/__init__.py index d5079b7e44..e2bc8086d2 100644 --- a/heat/engine/resources/__init__.py +++ b/heat/engine/resources/__init__.py @@ -60,6 +60,7 @@ def initialise(): global_env = environment.Environment({}, user_env=False) _load_global_environment(global_env) _environment = global_env + global_env.registry.log_resource_info(show_all=True) def _load_global_environment(env): diff --git a/heat/engine/service.py b/heat/engine/service.py index 8834a57943..d91b5a7ae5 100644 --- a/heat/engine/service.py +++ b/heat/engine/service.py @@ -624,6 +624,9 @@ class EngineService(service.Service): self._validate_deferred_auth_context(cnxt, stack) stack.validate() + # For the root stack print a summary of the TemplateResources loaded + if nested_depth == 0: + env.registry.log_resource_info(prefix=stack_name) return stack @context.request_context