From ae957bb3dc067b104e30ed45fd164fe04cbf3c4c Mon Sep 17 00:00:00 2001 From: Yao Lu Date: Mon, 24 Oct 2016 14:44:59 +0800 Subject: [PATCH] add patch for opnfv Change-Id: I50268130d9c76b25669ed2a83a99bf442e885a4e Signed-off-by: Yao Lu --- tools/setup/install/install_interface.sh | 7 +++++-- tools/setup/makefile | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) mode change 100644 => 100755 tools/setup/install/install_interface.sh diff --git a/tools/setup/install/install_interface.sh b/tools/setup/install/install_interface.sh old mode 100644 new mode 100755 index d08c266e..29736337 --- a/tools/setup/install/install_interface.sh +++ b/tools/setup/install/install_interface.sh @@ -249,15 +249,18 @@ function all_install config_get_node_info write_install_log "Daisy Install Successfull..." - + config_file="/home/daisy_install/daisy.conf" [ ! -e $config_file ] && return + + if [ -f install_interface_patch.sh ]; then ./install_interface_patch.sh ; fi + get_config "$config_file" default_backend_types local default_backend_types_params=$config_answer kolla=`echo $default_backend_types_params|grep 'kolla'|wc -l` if [ $kolla -ne 0 ];then write_install_log "Begin install kolla and depends..." - kolla_install + kolla_install fi } _INSTALL_INTERFACE_FILE="install_interface.sh" diff --git a/tools/setup/makefile b/tools/setup/makefile index 673f109d..c50e9a57 100755 --- a/tools/setup/makefile +++ b/tools/setup/makefile @@ -52,6 +52,7 @@ bin: binclean binforce chmod +x $(_TECS_TOOLS_PATH)/setup/bin_temp/uninstall/uninstall_func.sh chmod +x $(_TECS_TOOLS_PATH)/setup/bin_temp/upgrade/upgrade_interface.sh chmod +x $(_TECS_TOOLS_PATH)/setup/bin_temp/upgrade/upgrade_func.sh + if [ -e makefile_patch.sh ]; then ./makefile_patch.sh $(_TECS_TOOLS_PATH) ; fi cd $(_TECS_TOOLS_PATH)/setup; chmod +x ./makeself.sh; ./makeself.sh ./bin_temp $(_TECS_TARGET_PATH)/$(PURE_OS_TYPE)/$(ARCH)/$(VER_PREFIX)_$(BIN_TYPE).$(VER_SUFFIX) tecs ./setup.sh $(RM) $(_TECS_TOOLS_PATH)/setup/bin_temp