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_bootstrap/post-scripts/03_install_repo.sh | 5 ----- 1 file changed, 5 deletions(-) (limited to 'build/f_isoroot/f_bootstrap') diff --git a/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh b/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh index be17e7e0a..431577cba 100755 --- a/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh +++ b/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh @@ -26,9 +26,4 @@ if [ $? -ne 0 ]; then echo "Error removing /opt/opnfv/nailgun directory!" exit 1 fi -mv /opt/opnfv/fuel_bootstrap_cli.yaml /etc/fuel-bootstrap-cli/fuel_bootstrap_cli.yaml -if [ $? -ne 0 ]; then - echo "Error moving bootstrap image configuration!" - exit 1 -fi echo "Done installing pre-build repo" -- cgit 1.2.3-korg