From 9fa471b8c5ad505638713eb9b9a40dd04a977eaf Mon Sep 17 00:00:00 2001 From: Mark Burnett Date: Mon, 30 Apr 2018 10:16:00 -0500 Subject: [PATCH] Avoid using DH engine for substitution with DH Change-Id: I5fb07c84e0885ceb4acde1b8b6ac89c31e54d838 --- promenade/config.py | 8 ++++++-- promenade/design_ref.py | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/promenade/config.py b/promenade/config.py index f968a275..44b67ccd 100644 --- a/promenade/config.py +++ b/promenade/config.py @@ -63,9 +63,13 @@ class Configuration: @classmethod def from_design_ref(cls, design_ref, **kwargs): - documents, should_validate = get_documents(design_ref) + documents, use_dh_engine = get_documents(design_ref) - return cls(documents=documents, validate=should_validate, **kwargs) + return cls( + documents=documents, + substitute=use_dh_engine, + validate=use_dh_engine, + **kwargs) def __getitem__(self, path): return self.get_path(path, diff --git a/promenade/design_ref.py b/promenade/design_ref.py index 1bcbfeaf..c89eabf6 100644 --- a/promenade/design_ref.py +++ b/promenade/design_ref.py @@ -18,15 +18,15 @@ def get_documents(design_ref): LOG.debug('Fetching design_ref="%s"', design_ref) if design_ref.startswith(_DECKHAND_PREFIX): response = _get_from_deckhand(design_ref) - should_validate = False + use_dh_engine = False else: response = _get_from_basic_web(design_ref) - should_validate = True + use_dh_engine = True LOG.debug('Got response for design_ref="%s"', design_ref) response.raise_for_status() - return list(yaml.safe_load_all(response.text)), should_validate + return list(yaml.safe_load_all(response.text)), use_dh_engine def _get_from_basic_web(design_ref):