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 4313c5e..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
@@ -45,7 +45,7 @@ index e57a4fb..9a65cf6 100644
  )
  
  ASTUTE_YAML = '/etc/fuel/astute.yaml'
-@@ -35,15 +39,47 @@ def parse_arguments():
+@@ -35,15 +39,45 @@ def parse_arguments():
      check_file_exists(dea_file)
      return dea_file
  
@@ -88,14 +88,12 @@ index e57a4fb..9a65cf6 100644
 +        exec_cmd('echo "DEFROUTE=no" >> %s' % admin_ifcfg)
 +        log('At least one interface was reconfigured, restart network manager')
 +        exec_cmd('systemctl restart network')
-+        log('At least one interface was reconfigured, accept SSH on all')
-+        exec_cmd('iptables -A INPUT -p tcp --dport ssh -j ACCEPT')
      return astute
  
  
 @@ -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:
@@ -105,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)