diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-04-09 14:10:21 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-04-09 14:33:33 +0200 |
| commit | d116928396655b6db92b6786022ff68f13df58c7 (patch) | |
| tree | 163cb62910b132929abfe604f350395c2a59ec65 /build/f_isoroot/f_repobuild/opnfv_mirror_ubuntu.py | |
| parent | 64af432a852c0c0f6b5afc11ddde7609932704db (diff) | |
fuel-menu: Align defaults w/ OPNFV bootstrap cfg
Instead of overwriting fuel_bootstrap_cli.yaml during post-install,
with a static config which we need to manually sync in OPNFV after
each upstream change, make the whole thing dynamic by syncing (via
patch) fuel-menu's default settings with OPNFV bootstrap.
This allows us to drop the static fuel_bootstrap_cli.yaml.
JIRA: FUEL-266
Change-Id: I132f2a272c764ad0fc84b3e0e0e1222b1fab1cd2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'build/f_isoroot/f_repobuild/opnfv_mirror_ubuntu.py')
| -rwxr-xr-x | build/f_isoroot/f_repobuild/opnfv_mirror_ubuntu.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/build/f_isoroot/f_repobuild/opnfv_mirror_ubuntu.py b/build/f_isoroot/f_repobuild/opnfv_mirror_ubuntu.py index 1a603ee79..7c383639e 100755 --- a/build/f_isoroot/f_repobuild/opnfv_mirror_ubuntu.py +++ b/build/f_isoroot/f_repobuild/opnfv_mirror_ubuntu.py @@ -25,7 +25,7 @@ # "main". ############################################################################## # Mirror build steps (for EACH architecture in UBUNTU_ARCH): -# 1. Collect bootstrap package deps from <fuel_bootstrap_cli.yaml>; +# 1. Collect bootstrap package deps from fuel-agent's <settings.yaml.sample>; # 2. Collect all fixture release packages from fuel-web's <openstack.yaml>; # 3. Parse new "opnfv_config.yaml" list of packages (from old fuel-mirror); # 4. Inherit enviroment variable(s) for mirror URLs, paths etc. @@ -156,7 +156,8 @@ MIRROR_UBUNTU_PATH = get_env('MIRROR_UBUNTU_OPNFV_PATH') MIRROR_UBUNTU_TMP_PATH = '{0}.tmp'.format(MIRROR_UBUNTU_PATH) MIRROR_UBUNTU_MERGE = get_env('MIRROR_UBUNTU_MERGE') CFG_MM_UBUNTU = '{0}/ubuntu_mirror_local.yaml'.format(CFG_D) -FUEL_BOOTSTRAP_CLI_FILE = open('fuel_bootstrap_cli.yaml').read() +FUEL_BOOTSTRAP_CLI_FILE = open('fuel-agent/contrib/fuel_bootstrap/' + 'fuel_bootstrap_cli/fuel_bootstrap/settings.yaml.sample').read() FUEL_BOOTSTRAP_CLI = yaml.load(FUEL_BOOTSTRAP_CLI_FILE) FIXTURE_FILE = open('fuel-web/nailgun/nailgun/fixtures/openstack.yaml').read() FIXTURE = yaml.load(FIXTURE_FILE) @@ -215,7 +216,7 @@ for arch in UBUNTU_ARCH.split(' '): write_cfg_file(CFG_MM_UBUNTU, group_main_ubuntu[0]) # Collect package dependencies from: - ## 1. fuel_bootstrap_cli.yaml (bootstrap image additional packages) + ## 1. fuel_bootstrap_cli (bootstrap image additional packages) legacy_unresolved = legacy_diff(None, FUEL_BOOTSTRAP_CLI['packages'] + [ FUEL_BOOTSTRAP_CLI['kernel_flavor'], FUEL_BOOTSTRAP_CLI['kernel_flavor'].replace('image', 'headers')], |