From 603dac9a9ea3830fdf851e410ba1eced6ed32a2a Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 9 Apr 2017 14:10:21 +0200 Subject: 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 (cherry picked from commit d116928396655b6db92b6786022ff68f13df58c7) --- build/f_isoroot/f_repobuild/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'build/f_isoroot/f_repobuild/Makefile') 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 -- cgit 1.2.3-korg