pre merge to master

Teradata · Sep 6, 2017 · 48c03e4 · 48c03e4
1 parent ad6a719
commit 48c03e4
Show file tree

Hide file tree

Showing 69 changed files with 380 additions and 281 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
-/build-*-*/
-/src/order-*.mk
+*/build-*-*/
+*/src/order-*.mk
 .buildenv
 .buildenv-stacki
 .rpmmacros
@@ -9,4 +9,4 @@
 .DS_Store
 roll-*.xml
 .*.swp
-/3rdparty/
+*/3rdparty/
diff --git a/common/nodes/apache.xml b/common/nodes/apache.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 
-<kickstart>
+<stack>
 
   <description>
 
@@ -90,4 +90,4 @@ cat /proc/cpuinfo  | awk -F: '/^processor/{print $2;}' | wc -l > /var/tmp/profil
 chown apache:root /var/tmp/profile.semaphore
 </post>
 
-</kickstart> 
+</stack> 
diff --git a/common/nodes/backend.xml b/common/nodes/backend.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 
-<kickstart interface="public">
+<stack>
 
 
 <description>
@@ -51,5 +51,5 @@ cp /run/install/tmp/stack.conf /tmp/stack.conf
 </post>
 
 
-</kickstart> 
+</stack> 
 
diff --git a/common/nodes/base.xml b/common/nodes/base.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 
-<kickstart interface="public">
+<stack>
 
 <description>
 Base class for all nodes.
@@ -112,4 +112,4 @@ mv /tmp/ks-script* /var/log/stacki/ks
 updatedb
 </boot>
 
-</kickstart> 
+</stack> 
diff --git a/common/nodes/ca.xml b/common/nodes/ca.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" standalone="no"?>
 
 
-<kickstart>
+<stack>
 
   <description>
 
@@ -94,4 +94,4 @@ chgrp -R apache /etc/security/ca
 
 </post>
 
-</kickstart>
+</stack>
diff --git a/common/nodes/central.xml b/common/nodes/central.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 
-<kickstart>
+<stack>
 
 	<description>
 	 Stacki Frontend can serve Pallets to other Frontends
@@ -109,5 +109,5 @@ touch /var/www/html/robots.txt
 
 </post>
 
-</kickstart> 
+</stack> 
 
diff --git a/common/nodes/client.xml b/common/nodes/client.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 
-<kickstart interface="public">
+<stack>
 
 <description>
 The 'client node' in the graph.
@@ -62,4 +62,4 @@ gpgcheck=0
 </post>
 
 
-</kickstart> 
+</stack> 
diff --git a/common/nodes/database-data.xml b/common/nodes/database-data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<kickstart interface="public">
+<stack>
 
 	<description>
 	Populate cluster database with initial data
@@ -234,4 +234,4 @@ rm /tmp/my.cnf
 /opt/stack/bin/stack report host > /etc/hosts
 </post>
 
-</kickstart>
+</stack>
diff --git a/common/nodes/database-schema.xml b/common/nodes/database-schema.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 
-<kickstart>
+<stack>
 
 	<description>
 
@@ -464,4 +464,4 @@ grant select,update,insert,delete,lock tables on cluster.* to apache@"&hostname;
 
 </post>
 
-</kickstart>
+</stack>
diff --git a/common/nodes/database.xml b/common/nodes/database.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 
-<kickstart>
+<stack>
 
   <description>
 
@@ -170,4 +170,4 @@ for cmd in cmd_set:
 	except:
 		sys.stderr.write("Could not execute %s\n" % cmd)
 </post>
-</kickstart>
+</stack>
diff --git a/common/nodes/debug-post.xml b/common/nodes/debug-post.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" standalone="no"?>
 
 
-<kickstart>
+<stack>
 
   <description>
 
@@ -27,5 +27,5 @@ while [ -f /tmp/yo ]; do
 done
 </post>
 
-</kickstart> 
+</stack> 
 
diff --git a/common/nodes/debug-pre.xml b/common/nodes/debug-pre.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 
-<kickstart>
+<stack>
 
   <description>
 
@@ -26,7 +26,7 @@ while [ -f /tmp/yo ]; do
 done
 </pre>
 
-</kickstart> 
+</stack> 
 
 
 

diff --git a/common/nodes/dhcp-server.xml b/common/nodes/dhcp-server.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" standalone="no"?>
 
 
-<kickstart>
+<stack>
 
   <description>
 
@@ -23,5 +23,5 @@
 
 </post>
 
-</kickstart> 
+</stack> 
 
diff --git a/common/nodes/dns-server.xml b/common/nodes/dns-server.xml
@@ -2,7 +2,7 @@
 
 
 
-<kickstart>
+<stack>
 
   <description>
 
@@ -76,5 +76,5 @@ options {
 </post>
 
 
-</kickstart> 
+</stack> 
 
diff --git a/common/nodes/everything.xml b/common/nodes/everything.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 
-<kickstart>
+<stack>
 
 	<description>
 	Dummy empty node for building the OS Roll, this is the
@@ -39,4 +39,4 @@
 	<package>perl-TermReadKey</package>
 	<package>libgnome-keyring</package>
 
-</kickstart> 
+</stack> 
diff --git a/common/nodes/firewall-base.xml b/common/nodes/firewall-base.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<kickstart>
+<stack>
 
 	<description>
 	  Default firewall rules for all appliances.  Disable everything but SSH.
@@ -33,5 +33,5 @@
 </post>
 
 
-</kickstart> 
+</stack> 
 
diff --git a/common/nodes/firewall-client.xml b/common/nodes/firewall-client.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 
-<kickstart>
+<stack>
 
 
 <description>
@@ -18,5 +18,5 @@ https://github.com/Teradata/stacki/blob/master/LICENSE.txt
 </post>
 
 
-</kickstart> 
+</stack> 
 
diff --git a/common/nodes/firewall-server.xml b/common/nodes/firewall-server.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<kickstart>
+<stack>
 
 	<description>
 	  Server node firewall rules
@@ -51,4 +51,4 @@ chmod a+x /tmp/do-firewall.sh
 </post>
 
 
-</kickstart>
+</stack>
diff --git a/common/nodes/foundation-server.xml b/common/nodes/foundation-server.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 
-<kickstart>
+<stack>
 
 <description>
 Foundation Packages
@@ -58,4 +58,4 @@ fi
 
 </post>
 
-</kickstart> 
+</stack> 
diff --git a/common/nodes/frontend.xml b/common/nodes/frontend.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 
-<kickstart interface="public">
+<stack>
 
 
 <description>
@@ -17,5 +17,5 @@ https://github.com/Teradata/stacki/blob/master/LICENSE.txt
 <package>stack-command</package>
 
 
-</kickstart> 
+</stack> 
 
diff --git a/common/nodes/grub.xml b/common/nodes/grub.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 
-<kickstart>
+<stack>
 
 <description>
 Boot loader support (GRand Unified Bootloader)
@@ -28,4 +28,4 @@ cp /boot/grub/grub.conf /boot/grub/grub-orig.conf
 </post>
 
 
-</kickstart> 
+</stack> 
diff --git a/common/nodes/insert-rolls.xml b/common/nodes/insert-rolls.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 
-<kickstart>
+<stack>
 
 	<description>
 
@@ -42,4 +42,4 @@ for name, version, release, arch, url, diskid in generator.rolls:
 
 </post>
 
-</kickstart> 
+</stack> 
diff --git a/common/nodes/install.xml b/common/nodes/install.xml
@@ -2,7 +2,7 @@
 
 
 
-<kickstart>
+<stack>
 
   <description>
   Do everything needed to kickstart backend nodes or, generally speaking,
@@ -52,5 +52,5 @@ fi
 
 </post>
 
-</kickstart> 
+</stack> 
 
diff --git a/common/nodes/kernel-server.xml b/common/nodes/kernel-server.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 
-<kickstart>
+<stack>
 
 <description>
 Packages and configuration that should only be installed on servers
@@ -46,5 +46,5 @@ systemctl start ludicrous-server
 </post>
 
 
-</kickstart>
+</stack>
 
diff --git a/common/nodes/logrotate.xml b/common/nodes/logrotate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 
-<kickstart>
+<stack>
 
 <description>
 Append rules to logrotate to prune files in /var/log
@@ -87,5 +87,5 @@ https://github.com/Teradata/stacki/blob/master/LICENSE-ROCKS.txt
 </file>
 </post>
 
-</kickstart> 
+</stack> 
 
diff --git a/common/nodes/ludicrous-client.xml b/common/nodes/ludicrous-client.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<kickstart>
+<stack>
 
 	<description>
 	 Ludicrous client service for tracking packages  
@@ -32,5 +32,5 @@
 </post>
 
 
-</kickstart> 
+</stack> 
 
diff --git a/common/nodes/ludicrous-server.xml b/common/nodes/ludicrous-server.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<kickstart>
+<stack>
 
 	<description>
 	 Ludicrous server service for tracking packages
@@ -24,5 +24,5 @@
 /usr/bin/systemctl enable ludicrous-server
 </post>
 
-</kickstart>
+</stack>