From fef75a0204f74ead2698d8bb5080f4d2b6d976cd Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 17 Aug 2016 16:21:20 +0200 Subject: Rebase: upstream DEA mechanism changes Change-Id: I6a8a96caa095b20d85db2d4d418dd9cb121b12e4 Signed-off-by: Alexandru Avadanii --- .../0005-transplant-Generate-extra-interfaces-config-file.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'patches/opnfv-fuel/0005-transplant-Generate-extra-interfaces-config-file.patch') diff --git a/patches/opnfv-fuel/0005-transplant-Generate-extra-interfaces-config-file.patch b/patches/opnfv-fuel/0005-transplant-Generate-extra-interfaces-config-file.patch index 1291769e..76c27163 100644 --- a/patches/opnfv-fuel/0005-transplant-Generate-extra-interfaces-config-file.patch +++ b/patches/opnfv-fuel/0005-transplant-Generate-extra-interfaces-config-file.patch @@ -92,8 +92,8 @@ index e57a4fb..9a65cf6 100644 @@ -51,11 +85,14 @@ def main(): - dea_file = parse_arguments() check_file_exists(ASTUTE_YAML) + check_file_exists(FUEL_BOOTSTRAP_CLI_YAML) dea = DeploymentEnvironmentAdapter(dea_file) + log('Reading astute file %s' % ASTUTE_YAML) with io.open(ASTUTE_YAML) as stream: @@ -103,6 +103,6 @@ index e57a4fb..9a65cf6 100644 with io.open(ASTUTE_YAML, 'w') as stream: yaml.dump(astute, stream, default_flow_style=False) + log('Transplant done') - - - if __name__ == '__main__': + # Update bootstrap config yaml with info from DEA/astute.yaml + with io.open(FUEL_BOOTSTRAP_CLI_YAML) as stream: + fuel_bootstrap_cli = yaml.load(stream) -- cgit 1.2.3-korg