Merge "submodule: Kill yardstick"

[armband.git] / 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 2c8587a..76c2716 100644 (file)
--- a/patches/opnfv-fuel/0005-transplant-Generate-extra-interfaces-config-file.patch
+++ b/patches/opnfv-fuel/0005-transplant-Generate-extra-interfaces-config-file.patch
@@ -1,4 +1,3 @@
-From 7dad9f8350e8563942f4e9ffae595bbfe44e606d Mon Sep 17 00:00:00 2001
 From: Josep Puigdemont <josep.puigdemont@enea.com>
 Date: Wed, 4 May 2016 17:58:56 +0200
 Subject: [PATCH] transplant: Generate extra interfaces config file
@@ -93,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:
@@ -104,9 +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__':
--- 
-2.5.5
-
+     # 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)