x/daisycloud-core
Code Issues Proposed changes

modify install error

Browse Source 
Change-Id: I0960aa29c4d4566d395dce978c2671089d75eb09
Signed-off-by: luyao <lu.yao135@zte.com.cn>
This commit is contained in:
luyao 2016-07-25 09:24:43 +08:00
parent 22a3024ce4
commit f18d6ac561
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/daisy/daisy/api/v1/hosts.py
View File

@ -1946,7 +1946,7 @@ class Controller(controller.BaseController):
try:
subprocess.check_output(
'clush -S -w %s yum install jq'
'clush -S -w %s yum install -y jq'
% (discover_host_meta['ip'],),
shell=True, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e:

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

@ -101,7 +101,7 @@ function get_public_ip
{
local_ip_list=`ifconfig | grep "inet " | grep -v "127.0.0.1" | awk -F' ' {'print $2'} `
local def_gw_if=`route | grep default | awk -F' ' '{print $8}'|uniq`
local def_gw_if=`route | grep default | awk -F' ' '{print $8}'|uniq|head -1`
public_ip=""
if [[ -n "$def_gw_if" ]];then
public_ip=`ifconfig "$def_gw_if" | grep 'inet ' | cut -d: -f2 | awk '{ print $2}'`

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

@ -69,6 +69,7 @@ function all_install
install_rpm_by_yum "daisy"
write_install_log "install daisy dashboard rpm"
install_rpm_by_yum "python-django"
install_rpm_by_daisy_yum "python-django-horizon"
install_rpm_by_yum "daisy-dashboard"