From 8a79c1b635efb545bdd23c2ecc6fbe11c34bd924 Mon Sep 17 00:00:00 2001 From: Saravanan KR Date: Tue, 12 Jan 2021 16:37:54 +0530 Subject: [PATCH] Force json output format for hiera in derive pci whitelist For some reason, after queens to train FFU, when drive pci whitelist is executed, the hiera output is shown with the default output format 'ruby' (with => instead of :). This results in json parsing error. Force the output to be json which will work for regular and the ffu cases. Change-Id: I065ec0e7ae14530f6bf4f6fe356e885ba2b30d7f --- deployment/neutron/derive_pci_passthrough_whitelist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/neutron/derive_pci_passthrough_whitelist.py b/deployment/neutron/derive_pci_passthrough_whitelist.py index 92989abdf6..4bd1f138ab 100644 --- a/deployment/neutron/derive_pci_passthrough_whitelist.py +++ b/deployment/neutron/derive_pci_passthrough_whitelist.py @@ -142,7 +142,7 @@ def get_pci_passthrough_whitelist(user_config, pf, pci_addresses, def user_passthrough_config(): try: out, err = processutils.execute( - 'hiera', '-c', '/etc/puppet/hiera.yaml', + 'hiera', '-f', 'json', '-c', '/etc/puppet/hiera.yaml', _PASSTHROUGH_WHITELIST_KEY ) if not err: