Merge "Avoid using DH engine for substitution with DH"
This commit is contained in:
commit
066ce3e24c
@ -63,9 +63,13 @@ class Configuration:
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def from_design_ref(cls, design_ref, **kwargs):
|
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):
|
def __getitem__(self, path):
|
||||||
return self.get_path(path,
|
return self.get_path(path,
|
||||||
|
@ -18,15 +18,15 @@ def get_documents(design_ref):
|
|||||||
LOG.debug('Fetching design_ref="%s"', design_ref)
|
LOG.debug('Fetching design_ref="%s"', design_ref)
|
||||||
if design_ref.startswith(_DECKHAND_PREFIX):
|
if design_ref.startswith(_DECKHAND_PREFIX):
|
||||||
response = _get_from_deckhand(design_ref)
|
response = _get_from_deckhand(design_ref)
|
||||||
should_validate = False
|
use_dh_engine = False
|
||||||
else:
|
else:
|
||||||
response = _get_from_basic_web(design_ref)
|
response = _get_from_basic_web(design_ref)
|
||||||
should_validate = True
|
use_dh_engine = True
|
||||||
LOG.debug('Got response for design_ref="%s"', design_ref)
|
LOG.debug('Got response for design_ref="%s"', design_ref)
|
||||||
|
|
||||||
response.raise_for_status()
|
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):
|
def _get_from_basic_web(design_ref):
|
||||||
|
Loading…
Reference in New Issue
Block a user