x/daisycloud-core
Code Issues Proposed changes

Rename jasmine to daisy4nfv-jasmine

Browse Source 
Change-Id: I973de329009cf9e5d3d690d6429c923252f26a7e
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
This commit is contained in:
Zhijiang Hu 2017-08-04 18:54:57 +08:00
parent 13c15ff73f
commit db612142c8
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/kolla/prepare.sh
View File

@ -28,5 +28,5 @@ yum -y install ansible
# multicast related
prepare_dir=$(dirname $(readlink -f "$0"))
yum install -y $prepare_dir/jasmine*.rpm
yum install -y $prepare_dir/daisy4nfv-jasmine*.rpm
docker load < $prepare_dir/registry-server.tar

4
code/daisy/daisy/api/backends/kolla/install.py
View File

@ -444,9 +444,9 @@ def _thread_bin(req, cluster_id, host, root_passwd, fp, host_name_ip_list,
(host_ip, host_prepare_file, host_prepare_file)
daisy_cmn.subprocess_call(cmd, fp)
# scp jasmine.rpm to the same dir of prepare.sh at target host
# scp daisy4nfv-jasmine.rpm to the same dir of prepare.sh at target host
cmd = "scp -o ConnectTimeout=10 \
/var/lib/daisy/tools/jasmine*.rpm \
/var/lib/daisy/tools/daisy4nfv-jasmine*.rpm \
root@%s:%s" % (host_ip, host_prepare_file)
daisy_cmn.subprocess_call(cmd, fp)

2
tools/setup/install/install_func.sh
View File

@ -144,7 +144,7 @@ function kolla_install
fi
if [ ! -f "/var/lib/daisy/tools/registry-server.tar" ];then
cp $imagedir/registry-server.tar /var/lib/daisy/tools/ # keep jasmine for target hosts
cp $imagedir/registry-server.tar /var/lib/daisy/tools/ # keep it for target hosts
fi
docker load < $imagedir/registry-server.tar

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

@ -87,10 +87,10 @@ function all_install
write_install_log "install wget rpm"
install_rpm_by_yum "wget"
write_install_log "install jasmine"
write_install_log "install daisy4nfv-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"
cp daisy4nfv-jasmine*.rpm /var/lib/daisy/tools/ # keep it for target hosts
install_rpm_by_daisy_yum "daisy4nfv-jasmine"
if [ -f "/etc/zte-docker" ];then
write_install_log "install pxe_docker_install rpm"

6
tools/setup/makefile
View File

@ -57,9 +57,9 @@ bin: binclean binforce
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
$(CP) ./jasmine/daisy/code/jasmine/x86_64/daisy4nfv-jasmine*.rpm $(_TECS_TOOLS_PATH)/setup/bin_temp/
$(RM) $(_TECS_TOOLS_PATH)/setup/bin_temp/daisy4nfv-jasmine-devel*.rpm
$(RM) $(_TECS_TOOLS_PATH)/setup/bin_temp/daisy4nfv-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

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

@ -20,7 +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 "daisy-discoverd python-daisy-discoverd"
remove_rpms_by_yum "jasmine"
remove_rpms_by_yum "daisy4nfv-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