socsvn commit: r290046 - in soc2015/kczekirda/master/cluster: node01/cluster node02/cluster node03/cluster

kczekirda at FreeBSD.org kczekirda at FreeBSD.org
Fri Aug 21 18:52:02 UTC 2015 

Author: kczekirda
Date: Fri Aug 21 18:51:59 2015
New Revision: 290046
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=290046

Log:
  bsdinstall condition

Modified:
  soc2015/kczekirda/master/cluster/node01/cluster/bsdinstall.input
  soc2015/kczekirda/master/cluster/node01/cluster/run.sh
  soc2015/kczekirda/master/cluster/node02/cluster/bsdinstall.input
  soc2015/kczekirda/master/cluster/node02/cluster/run.sh
  soc2015/kczekirda/master/cluster/node03/cluster/bsdinstall.input
  soc2015/kczekirda/master/cluster/node03/cluster/run.sh

Modified: soc2015/kczekirda/master/cluster/node01/cluster/bsdinstall.input
==============================================================================
--- soc2015/kczekirda/master/cluster/node01/cluster/bsdinstall.input	Fri Aug 21 18:31:36 2015	(r290045)
+++ soc2015/kczekirda/master/cluster/node01/cluster/bsdinstall.input	Fri Aug 21 18:51:59 2015	(r290046)
@@ -1,5 +1,14 @@
 PARTITIONS=ada0
 DISTRIBUTIONS="kernel.txz base.txz"
+INTERFACE="bge0"
+IPV4="yes"
+DHCP="yes"
 
 #!/bin/sh
-echo "Installation complete, running in host system"
\ No newline at end of file
+echo "Installation complete, running in host system"
+pkg install curl
+/usr/local/bin/curl http://192.168.22.3:8080/admin/change_boot/$(hostname)/hdd.ipxe
+cat <<EOF > /etc/rc.local
+#!/bin/sh
+/usr/local/bin/curl http://192.168.22.3:8080/admin/change_boot/$(hostname)/take_task.ipxe
+EOF
\ No newline at end of file

Modified: soc2015/kczekirda/master/cluster/node01/cluster/run.sh
==============================================================================
--- soc2015/kczekirda/master/cluster/node01/cluster/run.sh	Fri Aug 21 18:31:36 2015	(r290045)
+++ soc2015/kczekirda/master/cluster/node01/cluster/run.sh	Fri Aug 21 18:51:59 2015	(r290046)
@@ -40,9 +40,14 @@
 $curl http://$master/admin/change_task_status/$revision/installation
 
 export BSDINSTALL_DISTDIR=/usr/src/release/ftp/
-bsdinstall script /cluster/bsdinstall.input
-
-$curl http://$master/admin/change_node_status/$(hostname)/rebooting
-$curl http://$master/admin/change_task_status/$revision/done
-$curl http://$master/admin/change_boot/$(hostname)/hdd.ipxe
-# reboot
+if bsdinstall script /cluster/bsdinstall.input; then
+	$curl http://$master/admin/change_node_status/$(hostname)/rebooting
+	$curl http://$master/admin/change_task_status/$revision/done
+	$curl http://$master/admin/change_boot/$(hostname)/hdd.ipxe
+	reboot
+else 
+	$curl http://$master/admin/change_node_status/$(hostname)/rebooting
+	$curl http://$master/admin/change_task_status/$revision/failed
+	$curl http://$master/admin/change_boot/$(hostname)/take_task.ipxe
+	reboot
+fi

Modified: soc2015/kczekirda/master/cluster/node02/cluster/bsdinstall.input
==============================================================================
--- soc2015/kczekirda/master/cluster/node02/cluster/bsdinstall.input	Fri Aug 21 18:31:36 2015	(r290045)
+++ soc2015/kczekirda/master/cluster/node02/cluster/bsdinstall.input	Fri Aug 21 18:51:59 2015	(r290046)
@@ -1,5 +1,14 @@
 PARTITIONS=ada0
 DISTRIBUTIONS="kernel.txz base.txz"
+INTERFACE="bge0"
+IPV4="yes"
+DHCP="yes"
 
 #!/bin/sh
-echo "Installation complete, running in host system"
\ No newline at end of file
+echo "Installation complete, running in host system"
+pkg install curl
+/usr/local/bin/curl http://192.168.22.3:8080/admin/change_boot/$(hostname)/hdd.ipxe
+cat <<EOF > /etc/rc.local
+#!/bin/sh
+/usr/local/bin/curl http://192.168.22.3:8080/admin/change_boot/$(hostname)/take_task.ipxe
+EOF
\ No newline at end of file

Modified: soc2015/kczekirda/master/cluster/node02/cluster/run.sh
==============================================================================
--- soc2015/kczekirda/master/cluster/node02/cluster/run.sh	Fri Aug 21 18:31:36 2015	(r290045)
+++ soc2015/kczekirda/master/cluster/node02/cluster/run.sh	Fri Aug 21 18:51:59 2015	(r290046)
@@ -40,9 +40,14 @@
 $curl http://$master/admin/change_task_status/$revision/installation
 
 export BSDINSTALL_DISTDIR=/usr/src/release/ftp/
-bsdinstall script /cluster/bsdinstall.input
-
-$curl http://$master/admin/change_node_status/$(hostname)/rebooting
-$curl http://$master/admin/change_task_status/$revision/done
-$curl http://$master/admin/change_boot/$(hostname)/hdd.ipxe
-# reboot
+if bsdinstall script /cluster/bsdinstall.input; then
+	$curl http://$master/admin/change_node_status/$(hostname)/rebooting
+	$curl http://$master/admin/change_task_status/$revision/done
+	$curl http://$master/admin/change_boot/$(hostname)/hdd.ipxe
+	reboot
+else 
+	$curl http://$master/admin/change_node_status/$(hostname)/rebooting
+	$curl http://$master/admin/change_task_status/$revision/failed
+	$curl http://$master/admin/change_boot/$(hostname)/take_task.ipxe
+	reboot
+fi

Modified: soc2015/kczekirda/master/cluster/node03/cluster/bsdinstall.input
==============================================================================
--- soc2015/kczekirda/master/cluster/node03/cluster/bsdinstall.input	Fri Aug 21 18:31:36 2015	(r290045)
+++ soc2015/kczekirda/master/cluster/node03/cluster/bsdinstall.input	Fri Aug 21 18:51:59 2015	(r290046)
@@ -1,5 +1,14 @@
 PARTITIONS=ada0
 DISTRIBUTIONS="kernel.txz base.txz"
+INTERFACE="bge0"
+IPV4="yes"
+DHCP="yes"
 
 #!/bin/sh
-echo "Installation complete, running in host system"
\ No newline at end of file
+echo "Installation complete, running in host system"
+pkg install curl
+/usr/local/bin/curl http://192.168.22.3:8080/admin/change_boot/$(hostname)/hdd.ipxe
+cat <<EOF > /etc/rc.local
+#!/bin/sh
+/usr/local/bin/curl http://192.168.22.3:8080/admin/change_boot/$(hostname)/take_task.ipxe
+EOF
\ No newline at end of file

Modified: soc2015/kczekirda/master/cluster/node03/cluster/run.sh
==============================================================================
--- soc2015/kczekirda/master/cluster/node03/cluster/run.sh	Fri Aug 21 18:31:36 2015	(r290045)
+++ soc2015/kczekirda/master/cluster/node03/cluster/run.sh	Fri Aug 21 18:51:59 2015	(r290046)
@@ -40,9 +40,14 @@
 $curl http://$master/admin/change_task_status/$revision/installation
 
 export BSDINSTALL_DISTDIR=/usr/src/release/ftp/
-bsdinstall script /cluster/bsdinstall.input
-
-$curl http://$master/admin/change_node_status/$(hostname)/rebooting
-$curl http://$master/admin/change_task_status/$revision/done
-$curl http://$master/admin/change_boot/$(hostname)/hdd.ipxe
-# reboot
+if bsdinstall script /cluster/bsdinstall.input; then
+	$curl http://$master/admin/change_node_status/$(hostname)/rebooting
+	$curl http://$master/admin/change_task_status/$revision/done
+	$curl http://$master/admin/change_boot/$(hostname)/hdd.ipxe
+	reboot
+else 
+	$curl http://$master/admin/change_node_status/$(hostname)/rebooting
+	$curl http://$master/admin/change_task_status/$revision/failed
+	$curl http://$master/admin/change_boot/$(hostname)/take_task.ipxe
+	reboot
+fi

More information about the svn-soc-all mailing list