diff options
| author |   Stefan Berg <stefan.k.berg@ericsson.com> | 2016-11-16 08:40:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-16 08:40:40 +0000 |
| commit | da5ed062277da74d394202a97ffa9344fe88ea2a (patch) | |
| tree | e71e707c1584e94f74925400dd59fcc87b5428ee /deploy | |
| parent | d4b0f79649da3ad7a3f3f59d3b92ea230f5b1826 (diff) | |
| parent | 9f8aff6636e0d86834178b461802f3e7cb95189d (diff) | |
Merge "Uplift to Fuel 10.0/Newton"
Diffstat (limited to 'deploy')
| -rw-r--r-- | deploy/transplant_fuel_settings.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/deploy/transplant_fuel_settings.py b/deploy/transplant_fuel_settings.py index 993b0dcce..ee915fdbe 100644 --- a/deploy/transplant_fuel_settings.py +++ b/deploy/transplant_fuel_settings.py @@ -94,7 +94,8 @@ def transplant_bootstrap(astute, fuel_bootstrap_cli): def main(): dea_file = parse_arguments() check_file_exists(ASTUTE_YAML) - check_file_exists(FUEL_BOOTSTRAP_CLI_YAML) + # Temporarily disabled for Fuel 10. + # 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,11 +106,12 @@ def main(): yaml.dump(astute, stream, default_flow_style=False) log('Transplant done') # 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) - transplant_bootstrap(astute, fuel_bootstrap_cli) - with io.open(FUEL_BOOTSTRAP_CLI_YAML, 'w') as stream: - yaml.dump(fuel_bootstrap_cli, stream, default_flow_style=False) + # Temporarily disabled for Fuel 10. + # with io.open(FUEL_BOOTSTRAP_CLI_YAML) as stream: + # fuel_bootstrap_cli = yaml.load(stream) + # transplant_bootstrap(astute, fuel_bootstrap_cli) + # with io.open(FUEL_BOOTSTRAP_CLI_YAML, 'w') as stream: + # yaml.dump(fuel_bootstrap_cli, stream, default_flow_style=False) if __name__ == '__main__': |