x/compass-adapters
Code Issues Proposed changes

Remove first-boot.json and related code in chef snippet

Browse Source 
Change-Id: I8832b8deee3c895d87c0559f74e41a2991a018d5
This commit is contained in:
Xicheng Chang 2014-04-08 18:47:12 +00:00
parent 54cdeb7034
commit 2d8b4a210a
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cobbler/snippets/chef
View File

@ -11,11 +11,6 @@ cat << EOL > /etc/chef/client.rb
$SNIPPET('client.rb')
EOL
## Generate first-boot.json
cat << EOL > /etc/chef/first-boot.json
$SNIPPET('first-boot.json')
EOL
## Register Server in Rsyslog
@ -38,7 +33,7 @@ while true; do
if [ "\$?" == "0" ]; then
exit 1
fi
chef-client -j /etc/chef/first-boot.json -L /var/log/chef-client.log &> /tmp/chef.log
chef-client -L /var/log/chef-client.log &> /tmp/chef.log
if [ "\$?" != "0" ]; then
sleep 1m
else

7
cobbler/snippets/first-boot.json
View File

@ -1,7 +0,0 @@
#set run_list=$getVar('$run_list', '')
#set cluster_databag=$getVar('$cluster_databag', None)
#if $cluster_databag != None
{ "run_list": [$run_list],
"cluster": "$cluster_databag"
}
#end if