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-24 16:30:47 +0000 |
| commit | 603dac9a9ea3830fdf851e410ba1eced6ed32a2a (patch) | |
| tree | 9489dbd19b8e73e106f162ad4113ec7b1a980207 /build/f_isoroot/f_repobuild/Makefile | |
| parent | 9e78ba77a04219512bae5b0855b573ab03b6c1a5 (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>
(cherry picked from commit d116928396655b6db92b6786022ff68f13df58c7)
Diffstat (limited to 'build/f_isoroot/f_repobuild/Makefile')
| -rw-r--r-- | build/f_isoroot/f_repobuild/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile index 891712b9a..c61d1adf5 100644 --- a/build/f_isoroot/f_repobuild/Makefile +++ b/build/f_isoroot/f_repobuild/Makefile @@ -27,6 +27,8 @@ nailgun: rm -Rf nailgun packetary opnfv_config && mkdir opnfv_config # We will analyze fuel-web's fixture files for package lists ln -sf ${F_SUBMOD_DIR}/fuel-web fuel-web + # Same for fuel-agent's bootstrap package list + ln -sf ${F_SUBMOD_DIR}/fuel-agent fuel-agent git clone --quiet $(PACKETARY_REPO) if [ -n $(PACKETARY_COMMIT) ]; then \ git -C packetary checkout $(PACKETARY_COMMIT); \ @@ -48,7 +50,6 @@ release:nailgun @rm -Rf ../release/opnfv/nailgun @mkdir -p ../release/opnfv @cp -Rp nailgun ../release/opnfv/nailgun - @cp fuel_bootstrap_cli.yaml ../release/opnfv/ ############################################################################ # Cache operations - only used when building through ci/build.sh |