Permalink
Browse files

CentOS test

       - can build backend nodes
       - added csv_partitions to backend.xml
       - redhat is always bootable (sles is not)
       - more cleanup for release=redhat7|redhat6
  • Loading branch information...
masonkatz committed Nov 8, 2017
1 parent 299b934 commit 27838317fcee340874107f372a5c34f335fe4d63
Showing with 69 additions and 976 deletions.
  1. +3 −0 Makefile
  2. +1 −1 common/nodes/mq-client.xml
  3. +0 −13 common/src/stack/command/bootactions.sh
  4. +2 −2 common/src/stack/command/stack/commands/create/pallet/__init__.py
  5. +2 −2 common/src/stack/command/stack/commands/report/host/network/__init__.py
  6. +1 −1 common/src/stack/command/stack/commands/sync/host/firewall/__init__.py
  7. +2 −2 common/src/stack/pylib/stack/bootable.py
  8. +2 −2 common/src/stack/pylib/stack/pallet.py
  9. +1 −1 common/src/stack/storage-config/bin/configure-partitions.py
  10. +6 −2 redhat/nodes/backend.xml
  11. +4 −4 redhat/nodes/base.xml
  12. +2 −2 redhat/nodes/client.xml
  13. +0 −239 redhat/nodes/database-data.xml
  14. +0 −474 redhat/nodes/database-schema.xml
  15. +0 −177 redhat/nodes/database.xml
  16. +3 −3 redhat/nodes/firewall-base.xml
  17. +1 −1 redhat/nodes/firewall-client.xml
  18. +2 −2 redhat/nodes/ludicrous-client.xml
  19. +1 −8 redhat/nodes/ludicrous-server.xml
  20. +2 −2 redhat/nodes/networking-client.xml
  21. +1 −1 redhat/nodes/node-certs.xml
  22. +2 −2 redhat/nodes/node.xml
  23. +2 −2 redhat/nodes/pre-ssh-key.xml
  24. +2 −2 redhat/nodes/redhat-bootaction.xml
  25. +1 −1 redhat/nodes/repo-client.xml
  26. +1 −1 redhat/nodes/resolv.xml
  27. +1 −1 redhat/nodes/routes-client.xml
  28. +1 −1 redhat/nodes/server.xml
  29. +3 −3 redhat/nodes/ssh-client.xml
  30. +1 −1 redhat/nodes/ssl-client.xml
  31. +2 −2 redhat/nodes/ssl-server.xml
  32. +3 −3 redhat/nodes/storage.xml
  33. +1 −1 redhat/nodes/time-client.xml
  34. +2 −2 redhat/nodes/time-server.xml
  35. +0 −1 redhat/src/stack/images/7.x-armv7hl.mk
  36. +1 −2 redhat/src/stack/images/Makefile
  37. 0 redhat/src/stack/images/{6.x.mk → redhat6.mk}
  38. 0 redhat/src/stack/images/{7.x-x86_64.mk → redhat7.mk}
  39. +1 −1 sles/nodes/add-on.xml
  40. +6 −6 sles/nodes/backend.xml
  41. +1 −1 sles/nodes/firewall-client.xml
  42. +2 −2 sles/nodes/partitioning.xml
  43. +0 −2 version.mk
View
@@ -5,6 +5,9 @@
# @copyright@
OS=$(shell common/src/stack/build/build/bin/os)
ifeq ($(OS),redhat)
BOOTABLE=1
endif
ROLLROOT = .
@@ -10,7 +10,7 @@
systemctl enable rmq-shipper
chkconfig --add rmq-shipper
<stack:report name="host.mq">&hostname;</stack:report>
<stack:report stack:name="host.mq">&hostname;</stack:report>
<!-- the following channels are shipped by default -->
<stack:file stack:name="/etc/sysconfig/stack-mq-channels" stack:mode="append">

This file was deleted.

Oops, something went wrong.
@@ -370,15 +370,15 @@ def makeBootable(self, name, version, release, arch):
fout.write('lang en_US\n')
fout.write('keyboard us\n')
fout.write('interactive\n')
if release == '7.x':
if release == 'redhat7':
fout.write('url --url cdrom:cdrom:%s\n' % palletdir)
else:
fout.write('url --url http://127.0.0.1/%s\n' % distdir)
fout.close()
# Write USB file
if release == '7.x':
if release == 'redhat7':
fout = open(os.path.join('disk1', 'ks-usb.cfg'), 'w')
fout.write('install\n')
fout.write('lang en_US\n')
@@ -65,10 +65,10 @@ def run(self, params, args):
self.addOutput(host, '</stack:file>')
#
# 7.x requires the hostname to be placed into
# Some version require the hostname to be placed into
# /etc/hostname
#
if stack.release == '7.x':
if stack.release in [ 'redhat7', 'sles11', 'sles12' ]:
self.addOutput(host,
'<stack:file stack:name="/etc/hostname">')
self.addOutput(host, '%s' % hostname)
@@ -76,7 +76,7 @@ def run(self, params, args):
if restartit:
threads = []
for host in hosts:
if stack.release == '7.x' or stack.release == '12':
if stack.release in [ 'redhat7', 'sles12' ]:
cmd = 'systemctl restart iptables'
else:
cmd = '/sbin/service iptables restart'
@@ -153,7 +153,7 @@ def installBootfiles(self, destination):
if not os.path.exists(imagesdir):
os.makedirs(imagesdir)
if stack.release == '6.x':
if stack.release == 'redhat6':
#
# install.img
#
@@ -163,7 +163,7 @@ def installBootfiles(self, destination):
os.rename(fileold, filenew)
os.chmod(filenew, stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH)
if stack.release == '7.x':
if stack.release == 'redhat7':
#
# updates.img
#
@@ -294,11 +294,11 @@ def downloadNetworkPallets(self, pallets, dialog=None):
dialog.completePallet()
#
# if this is the stacki pallet for 7.x then we need to
# if this is the stacki pallet for redhat7 then we need to
# copy the LiveOS and images directories into the
# destination
#
if name == 'stacki' and stack.release == '7.x':
if name == 'stacki' and stack.release == 'redhat7':
os.chdir(localpath)
purl = os.path.join(url, 'LiveOS')
@@ -466,7 +466,7 @@ def doRAID(csv_partitions, host_partitions):
default = 'default'
ostype = 'rhel7'
if release == '6.x':
if release == 'redhat6':
ostype = 'rhel6'
var = '%s_%s' % (ostype, default)
View
@@ -6,9 +6,13 @@ Backend Appliance Node. You should create your own extend-backend.xml
file to add functionality to this appliance type.
</stack:description>
<stack:stacki>
csv_partitions = <stack:report stack:name="host.storage.partition">&hostname;</stack:report>
csv_controller = <stack:report stack:name="host.storage.controller">&hostname;</stack:report>
</stack:stacki>
<stack:native stack:lang="kickstart">
<stack:eval shell="/opt/stack/bin/python3" mode="xml">
<stack:eval stack:shell="/opt/stack/bin/python3" stack:mode="xml">
import stack.api
@@ -61,7 +65,7 @@ ldconfig
/opt/stack/bin/stacki-status.py install complete rebooting
</stack:script>
<stack:script stack:cond="'&release;' == '7.x'" stack:stage="install-post">
<stack:script stack:cond="release == 'redhat7'" stack:stage="install-post">
cp /run/install/tmp/stack.conf /tmp/stack.conf
</stack:script>
View
@@ -29,10 +29,10 @@ keyboard &Kickstart_Keyboard;
timezone --utc &Kickstart_Timezone;
<stack:eval shell="/opt/stack/bin/python3" mode="xml">
if '&boot_device;' != '' and '&release;' == '6.x':
<stack:eval stack:shell="/opt/stack/bin/python3" stack:mode="xml">
if '&boot_device;' != '' and '&release;' == 'redhat6':
print "bootloader --location=none"
elif '&boot_device;' != '' and '&release;' == '7.x':
elif '&boot_device;' != '' and '&release;' == 'redhat7':
print "bootloader --location=mbr --boot-drive=&boot_device;"
else:
print "bootloader --location=mbr"
@@ -41,7 +41,7 @@ else:
</stack:native>
<stack:package stack:cond="'&release;' == '7.x'">net-tools</stack:package>
<stack:package stack:cond="release == 'redhat7'">net-tools</stack:package>
<stack:package>foundation-rcs</stack:package>
<stack:package>mlocate</stack:package>
<stack:package>vim</stack:package>
View
@@ -48,11 +48,11 @@ gpgcheck=0
</stack:script>
<stack:script stack:cond="'&release;' == '6.x'" stack:stage="install-post">
<stack:script stack:cond="release == 'redhat6'" stack:stage="install-post">
/sbin/chkconfig ipmi on
</stack:script>
<stack:script stack:cond="'&release;' == '7.x'" stack:stage="install-post">
<stack:script stack:cond="release == 'redhat7'" stack:stage="install-post">
systemctl enable ipmi
</stack:script>
Oops, something went wrong.

0 comments on commit 2783831

Please sign in to comment.