x
/
compass-adapters
Code Issues Proposed changes

Merge "use knife node list instead of knife search node to check existance" into dev/experimental

This commit is contained in:
Jenkins 2015-01-28 17:17:18 +00:00 committed by Gerrit Code Review
parent 20dcf7c257 8a778af908
commit 7cf80ebf74
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

@ -40,8 +40,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

@ -39,8 +39,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