openstack
/
fuel-virtualbox
Code Issues Proposed changes

Correct parsing of bootstrap_admin_node.log 

This commit fixes parsing of $goodline and $badline strings
in the 'bootstrap_admin_node.log' which causes incorrect
behaviour of VirtualBox scripts under Windows 10.

Change-Id: Ib90582adf4d5b3aa03ade081d788e5177add4b93
Closes-Bug: #1538143
This commit is contained in:
Maksim Malchuk 2016-01-26 17:20:13 +03:00
parent 313f515875
commit b09d8c6081
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
functions/product.sh
View File

@ -39,15 +39,15 @@ wait_for_line_in_puppet_bootstrap() {
expect "*?assword:*"
send "$password\r"
expect "$prompt"
send "egrep --color=none -e '$goodline' -e '$badline' /var/log/puppet/bootstrap_admin_node.log\r"
send "egrep --color=none -e '${goodline}' -e '${badline}' /var/log/puppet/bootstrap_admin_node.log\r"
expect "$prompt"
send "logout\r"
expect "$prompt"
ENDOFEXPECT
)
echo "$result" | egrep "$badline" >&2 && return 1
echo "$result" | egrep -q "$goodline" && return 0
echo "$result" | grep -v grep | egrep -q "$badline" >&2 && return 1
echo "$result" | grep -v grep | egrep -q "$goodline" >&2 && return 0
return 1
}