x/daisycloud-core
Code Issues Proposed changes

Add jasmine to daisy.bin

Browse Source 
Change-Id: Ife96b02358f3fcb822d7d750a5f6696c7f52320d
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
This commit is contained in:
Zhijiang Hu 2017-04-10 05:15:33 -04:00
parent e86c3d6128
commit 6bac9c52a4
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/setup/install/install_interface.sh
View File

@ -85,6 +85,10 @@ function all_install
write_install_log "install wget rpm"
install_rpm_by_yum "wget"
write_install_log "install jasmine"
mkdir -p /var/lib/daisy/tools/
cp jasmine*.rpm /var/lib/daisy/tools/ # keep jasmine for target hosts
install_rpm_by_daisy_yum "jasmine"
if [ -f "/etc/zte-docker" ];then
write_install_log "install pxe_docker_install rpm"

11
tools/setup/makefile
View File

@ -50,6 +50,17 @@ 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
$(RM) ./jasmine
$(MKDIR) ./jasmine
cd ./jasmine && \
git clone https://gerrit.opnfv.org/gerrit/daisy && \
cd ./daisy/code/jasmine && \
./autogen.sh && ./configure && make rpm
$(CP) ./jasmine/daisy/code/jasmine/x86_64/jasmine*.rpm $(_TECS_TOOLS_PATH)/setup/bin_temp/
$(RM) $(_TECS_TOOLS_PATH)/setup/bin_temp/jasmine-devel*.rpm
$(RM) $(_TECS_TOOLS_PATH)/setup/bin_temp/jasmine-debuginfo*.rpm
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

1
tools/setup/uninstall/uninstall_interface.sh
View File

@ -20,6 +20,7 @@ function uninstall_daisy
remove_rpms_by_yum "python-django-horizon daisy-dashboard"
remove_rpms_by_yum "daisy python-daisyclient python-daisy"
remove_rpms_by_yum "openstack-ironic-discoverd python-ironic-discoverd"
remove_rpms_by_yum "jasmine"
rpm -e pxe_server_install
for i in `ps -elf | grep daisy-api |grep -v grep | awk -F ' ' '{print $4}'`;do kill -9 $i;done
for j in `ps -elf | grep daisy-registry |grep -v grep | awk -F ' ' '{print $4}'`;do kill -9 $j;done