aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/adapters/cobbler
diff options
context:
space:
mode:
authorliyuenan <liyuenan@huawei.com>2017-01-14 11:31:08 +0800
committerJustin chi <chigang@huawei.com>2017-01-14 05:48:28 +0000
commit2e33f30a1f0a17692d6d0348248df10b98cfb498 (patch)
tree1f8d3612a4667bf977db5ce5a0cbe0696f06e78b /deploy/adapters/cobbler
parent1da2cee07a11d5dd7b83ab0437807fc239929f1c (diff)
Deploy OpenStack Newton on CentOS hosts
JIRA: COMPASS-518 Make Centos Newton ppa. Update host Centos version to 7.3. Support Centos Newton Deploy. Support Ceph Deploy. Change-Id: I6dd110cc10d425a9d590e1dcb5777ade5cce96aa Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/adapters/cobbler')
-rw-r--r--deploy/adapters/cobbler/kickstarts/default.ks20
-rw-r--r--deploy/adapters/cobbler/snippets/kickstart_post_anamon2
2 files changed, 11 insertions, 11 deletions
diff --git a/deploy/adapters/cobbler/kickstarts/default.ks b/deploy/adapters/cobbler/kickstarts/default.ks
index ecd877b8..aea955bb 100644
--- a/deploy/adapters/cobbler/kickstarts/default.ks
+++ b/deploy/adapters/cobbler/kickstarts/default.ks
@@ -87,20 +87,20 @@ $SNIPPET('kickstart_pre_anamon')
%packages --nobase
@core
iproute
-ntp
+# ntp
openssh-clients
-wget
-yum-plugin-priorities
+# wget
+# yum-plugin-priorities
json-c
libestr
rsyslog
parted
-vim
-lsof
-strace
-#if $os_version == "rhel7"
-net-tools
-#end if
+# vim
+# lsof
+# strace
+# if $os_version == "rhel7"
+# net-tools
+# end if
#if $getVar('tool', '') != ''
#set $kickstart_software = "kickstart_software_%s" % $tool
$SNIPPET($kickstart_software)
@@ -118,7 +118,7 @@ chkconfig ip6tables off
$SNIPPET('kickstart_yum')
$SNIPPET('kickstart_ssh')
-$SNIPPET('kickstart_ntp')
+# $SNIPPET('kickstart_ntp')
$SNIPPET('kickstart_limits.conf')
$SNIPPET('kickstart_sysctl.conf')
$SNIPPET('kickstart_rsyslog.conf')
diff --git a/deploy/adapters/cobbler/snippets/kickstart_post_anamon b/deploy/adapters/cobbler/snippets/kickstart_post_anamon
index 699e830f..d1dec7b4 100644
--- a/deploy/adapters/cobbler/snippets/kickstart_post_anamon
+++ b/deploy/adapters/cobbler/snippets/kickstart_post_anamon
@@ -76,7 +76,7 @@ cat << EOF > /etc/init.d/set_state
#
#end raw
-wget -O /tmp/os_state --post-data='{"ready": true}' --header=Content-Type:application/json "http://$srv/api/hosts/${hostname}/state_internal"
+curl -H "Content-Type: application/json" -X POST -d '{"ready": true}' "http://$srv/api/hosts/${hostname}/state_internal"
chkconfig set_state off
mv /etc/init.d/set_state /tmp/set_state
EOF