x/compass-adapters
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2014-04-10 00:01:20 +00:00 committed by Gerrit Code Review
commit a0753a946e
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') $SNIPPET('client.rb')
EOL EOL
## Generate first-boot.json
cat << EOL > /etc/chef/first-boot.json
$SNIPPET('first-boot.json')
EOL
## Register Server in Rsyslog ## Register Server in Rsyslog
@ -38,7 +33,7 @@ while true; do
if [ "\$?" == "0" ]; then if [ "\$?" == "0" ]; then
exit 1 exit 1
fi 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 if [ "\$?" != "0" ]; then
sleep 1m sleep 1m
else 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