diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-10-12 16:42:35 +0200 |
|---|---|---|
| committer | Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-11-15 15:35:15 +0100 |
| commit | 9f8aff6636e0d86834178b461802f3e7cb95189d (patch) | |
| tree | 3bbfec85cda9774295b5f30f8417ee36e512368d /deploy | |
| parent | 38579142c683dbf26a6560d53d900111f4df4f6b (diff) | |
Uplift to Fuel 10.0/Newton
Build working, automated deploy working (simple test cases only).
All plugins disabled, so is the generation of the local ISO cache.
Both need to be re-enabled after merge of this uplift.
All patches wiped, pertinent ones need to be re-enabled after the
merge of this uplift.
Change-Id: I978a3d4ed25a45a4b88a6e35693baac597b162c2
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
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__': |