Skip to content

Commit

Permalink
Merge 01971cd into 5252f32
Browse files Browse the repository at this point in the history
  • Loading branch information
pengz1 committed Jan 22, 2018
2 parents 5252f32 + 01971cd commit f97096c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
12 changes: 8 additions & 4 deletions data/templates/centos-ks
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# Copyright 2017, DELL, Inc.
# Copyright © 2017-2018 Dell Inc. or its subsidiaries. All Rights Reserved.
# For more details on CentOS/RHEL kickstart configurations, please refer to below link:
# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/installation_guide/sect-kickstart-syntax

install
#text
graphical
Expand Down Expand Up @@ -73,7 +76,7 @@ clearpart --all --drives=<%=installDisk%>
reboot

# Package Selection
%packages --nobase --excludedocs
%packages --nobase --excludedocs --ignoremissing
@core
-*firmware
-iscsi*
Expand Down Expand Up @@ -298,8 +301,9 @@ export PATH
<% } %>

# Download the service to callback to RackHD after OS installation/reboot completion
echo "RackHD POST script wget started"
/usr/bin/wget http://<%=server%>:<%=port%>/api/current/templates/<%=rackhdCallbackScript%>?nodeId=<%=nodeId%> -O /etc/rc.d/init.d/<%=rackhdCallbackScript%>
echo "RackHD POST script curl started"
/bin/curl http://<%=server%>:<%=port%>/api/current/templates/<%=rackhdCallbackScript%>?nodeId=<%=nodeId%> > /etc/rc.d/init.d/<%=rackhdCallbackScript%>

echo "RackHD POST script chmod callback script"
chmod +x /etc/rc.d/init.d/<%=rackhdCallbackScript%>
# Enable the above service, it should auto-disable after running once
Expand Down
4 changes: 3 additions & 1 deletion data/templates/centos.rackhdcallback
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#! /bin/bash
# Copyright © 2018 Dell Inc. or its subsidiaries. All Rights Reserved.
#
# centos.rackhdcallback callback to rackhd post installation API hook
#
Expand Down Expand Up @@ -26,6 +27,7 @@
# Nothing wrong with set -e here since we're not doing anything complex
set -e
echo "Attempting to call back to RackHD CentOS installer"
wget --retry-connrefused --waitretry=1 -t 300 --post-data '{"nodeId":"<%=nodeId%>"}' --header='Content-Type:application/json' http://<%=server%>:<%=port%>/api/current/notification
curl -X POST -H 'Content-Type:application/json' 'http://<%=server%>:<%=port%>/api/current/notification?nodeId=<%=nodeId%>'
#wget --retry-connrefused --waitretry=1 -t 300 --post-data '{"nodeId":"<%=nodeId%>"}' --header='Content-Type:application/json' http://<%=server%>:<%=port%>/api/current/notification
# Only run this once to verify the OS was installed, then disable it forever
chkconfig centos.rackhdcallback off
4 changes: 1 addition & 3 deletions lib/graphs/set-bmc-credentials-graph.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// Copyright 2016, EMC, Inc.

// Copyright © 2016-2018 Dell Inc. or its subsidiaries. All Rights Reserved.
'use strict';

module.exports = {
Expand Down Expand Up @@ -33,7 +32,6 @@ module.exports = {
},
ignoreFailure: true
},

{
label: 'catalog-bmc',
taskName: 'Task.Catalog.bmc',
Expand Down

0 comments on commit f97096c

Please sign in to comment.