From 2d8b4a210ab14c23f163e7f584641f4c722f171e Mon Sep 17 00:00:00 2001
From: Xicheng Chang <xichengchang@huawei.com>
Date: Tue, 8 Apr 2014 18:47:12 +0000
Subject: [PATCH] Remove first-boot.json and related code in chef snippet
Change-Id: I8832b8deee3c895d87c0559f74e41a2991a018d5
---
cobbler/snippets/chef | 7 +------
cobbler/snippets/first-boot.json | 7 -------
2 files changed, 1 insertion(+), 13 deletions(-)
delete mode 100644 cobbler/snippets/first-boot.json
diff --git a/cobbler/snippets/chef b/cobbler/snippets/chef
index fd450db..8715992 100644
--- a/cobbler/snippets/chef
+++ b/cobbler/snippets/chef
@@ -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
diff --git a/cobbler/snippets/first-boot.json b/cobbler/snippets/first-boot.json
deleted file mode 100644
index 7bd1b9d..0000000
--- a/cobbler/snippets/first-boot.json
+++ /dev/null
@@ -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