x/compass-adapters
Code Issues Proposed changes

use knife node list instead of knife search node to check existance

Browse Source 
knife search node does not work as expected in some cases like in
the bug report, although the cause is not clear yet but switch to
knife node list |grep doesn't hurt.

Change-Id: I16979e93183b13b5a3e2c3281f4033515428f2b2
Closes-bug: #1405415
This commit is contained in:
Jerry Zhao 2014-12-26 02:38:04 -08:00
parent 67d09e782f
commit 8a778af908
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cobbler/snippets/kickstart_chef_run.sh
View File

@ -41,8 +41,10 @@ while true; do
break
else
echo "knife search nodes" &>> /tmp/chef.log
USER=root HOME=/root knife search node "name:\\$HOSTNAME.*" -i -a name &>> /tmp/chef.log
nodes=\\$(USER=root HOME=/root knife search node "name:\\$HOSTNAME.*" -i -a name | grep 'name: ' | awk '{print \\$2}')
# use knife node list here to check if node has been registered because knife search node
# doesn't work as expected.
USER=root HOME=/root knife node list |grep $HOSTNAME. &>> /tmp/chef.log
nodes=\\$(USER=root HOME=/root knife node list |grep $HOSTNAME.)
echo "found nodes \\$nodes" &>> /tmp/chef.log
let all_nodes_success=1
for node in \\$nodes; do

4
cobbler/snippets/preseed_chef_run.sh
View File

@ -40,8 +40,8 @@ while true; do
break
else
echo "knife search nodes" &>> /tmp/chef.log
USER=root HOME=/root knife search node "name:\\$HOSTNAME.*" -i -a name &>> /tmp/chef.log
nodes=\\$(USER=root HOME=/root knife search node "name:\\$HOSTNAME.*" -i -a name | grep 'name: ' | awk '{print \\$2}')
USER=root HOME=/root knife node list |grep $HOSTNAME. &>> /tmp/chef.log
nodes=\\$(USER=root HOME=/root knife node list |grep $HOSTNAME.)
echo "found nodes \\$nodes" &>> /tmp/chef.log
all_nodes_success=1
for node in \\$nodes; do