From 62ef322ae46b734c00f6762757c4cdd45170e538 Mon Sep 17 00:00:00 2001
From: Joe Kaiser <joe.kaiser@teradata.com>
Date: Mon, 13 Nov 2017 19:25:31 -0500
Subject: [PATCH] graph ordering issues. ldconfig to node.xml rather than
 yum-repo.xml Initial remove of boss references in images. This builds a combo
 roll on redhat.

---
 common/graph/frontend.xml                      |  1 +
 common/nodes/database.xml                      | 18 +++++++++++++++---
 redhat/graph/redhat-frontend.xml               |  1 -
 redhat/nodes/base.xml                          |  7 -------
 redhat/nodes/node.xml                          |  7 +++++++
 .../stack/images/7.1708/isolinux/isolinux.cfg  |  4 ++--
 .../site-packages/pyanaconda/install.py        |  2 +-
 .../updates.img/usr/sbin/anaconda-stacki       |  2 +-
 8 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/common/graph/frontend.xml b/common/graph/frontend.xml
index 4ddd1c172..003d9a40c 100644
--- a/common/graph/frontend.xml
+++ b/common/graph/frontend.xml
@@ -24,6 +24,7 @@
 
 
 	<edge from="server">
+		<to>apache</to>
 		<to>database</to>
 		<to>database-schema</to>
 		<to>database-data-init</to>
diff --git a/common/nodes/database.xml b/common/nodes/database.xml
index 1f4af849d..745680afc 100644
--- a/common/nodes/database.xml
+++ b/common/nodes/database.xml
@@ -13,6 +13,7 @@
         </stack:rocks>
 
 	<stack:package>stack-sql</stack:package>
+	<stack:package>screen</stack:package>
 	<stack:package>foundation-mariadb</stack:package>
 
 
@@ -93,9 +94,21 @@ password	= $apache_pw
 -->
 /opt/stack/sbin/mysql-install-db
 
-/usr/bin/systemctl enable mariadb
-/usr/bin/systemctl start mariadb
+systemctl enable mariadb
 
+grep frontend /proc/cmdline &gt; /dev/null 2>&amp;1
+RES=$?
+if [ ${RES} -eq 0 ]; then
+
+export MYSQLD_OPTS="--defaults-file=/opt/stack/etc/my.cnf.d/server.cnf \
+	--basedir=/opt/stack --datadir=/var/opt/stack/mysql \
+	--user=stackdb"
+
+nohup /opt/stack/sbin/mysqld $MYSQLD_OPTS &amp;
+
+else
+        /usr/bin/systemctl start mariadb
+fi
 <!--
 	Make sure that the database is
 	up and running
@@ -105,7 +118,6 @@ while [ $? -eq 1 ]; do
         sleep 1
         /opt/stack/bin/mysqladmin -s ping > /dev/null
 done
-
 </stack:script>
 
 <!-- Access control on the database -->
diff --git a/redhat/graph/redhat-frontend.xml b/redhat/graph/redhat-frontend.xml
index c0fdd70a0..93da6dc6e 100644
--- a/redhat/graph/redhat-frontend.xml
+++ b/redhat/graph/redhat-frontend.xml
@@ -54,7 +54,6 @@
 
 	<edge from="server">
 		<to>base</to>
-		<to>apache</to>
 		<to>security-server</to>
 		<to>time-server</to>
 		<to>install</to>
diff --git a/redhat/nodes/base.xml b/redhat/nodes/base.xml
index 43ee77739..4ef9b80d3 100644
--- a/redhat/nodes/base.xml
+++ b/redhat/nodes/base.xml
@@ -105,13 +105,6 @@ stacki release &version; (&release;)
 </stack:file>
 </stack:script>
 
-<stack:script stack:stage="install-post">
-<stack:file stack:name="/etc/ld.so.conf.d/stack.conf">
-/opt/stack/lib
-</stack:file>
-ldconfig
-</stack:script>
-
 <stack:script stack:stage="install-post" stack:chroot="false">
 /opt/stack/bin/stacki-profile.py &gt; /root/prof.log 2&gt;&amp;1
 
diff --git a/redhat/nodes/node.xml b/redhat/nodes/node.xml
index d1de158c9..647a336fe 100644
--- a/redhat/nodes/node.xml
+++ b/redhat/nodes/node.xml
@@ -25,6 +25,13 @@ rootpw --iscrypted &Kickstart_PrivateRootPassword;
 
 <stack:package>stack-config</stack:package>
 
+<stack:script stack:stage="install-post">
+<stack:file stack:name="/etc/ld.so.conf.d/stack.conf">
+/opt/stack/lib
+</stack:file>
+ldconfig
+</stack:script>
+
 
 <stack:script stack:stage="install-post">
 <!-- configure IP forwarding -->
diff --git a/redhat/src/stack/images/7.1708/isolinux/isolinux.cfg b/redhat/src/stack/images/7.1708/isolinux/isolinux.cfg
index 31df3fb36..5713935bb 100644
--- a/redhat/src/stack/images/7.1708/isolinux/isolinux.cfg
+++ b/redhat/src/stack/images/7.1708/isolinux/isolinux.cfg
@@ -6,12 +6,12 @@ label frontend
 	menu default
 	menu label Install Frontend via DVD
         kernel vmlinuz
-	append ramdisk_size=300000 initrd=initrd.img devfs=nomount kssendmac selinux=0 frontend build boss nowatchdog inst.ks=cdrom:/ks.cfg inst.text
+	append ramdisk_size=300000 initrd=initrd.img devfs=nomount kssendmac selinux=0 frontend build nowatchdog inst.ks=cdrom:/ks.cfg inst.text
 
 label frontendusb
 	menu label Install Frontend via USB flash drive
         kernel vmlinuz
-	append ramdisk_size=300000 initrd=initrd.img devfs=nomount kssendmac selinux=0 frontend build boss nowatchdog inst.ks=hd:LABEL=stacki:/ks-usb.cfg inst.text
+	append ramdisk_size=300000 initrd=initrd.img devfs=nomount kssendmac selinux=0 frontend build nowatchdog inst.ks=hd:LABEL=stacki:/ks-usb.cfg inst.text
 
 label backend
 	menu label Install Backend
diff --git a/redhat/src/stack/images/7.1708/updates.img/usr/lib64/python2.7/site-packages/pyanaconda/install.py b/redhat/src/stack/images/7.1708/updates.img/usr/lib64/python2.7/site-packages/pyanaconda/install.py
index 8e9d6524a..a51d6e97a 100644
--- a/redhat/src/stack/images/7.1708/updates.img/usr/lib64/python2.7/site-packages/pyanaconda/install.py
+++ b/redhat/src/stack/images/7.1708/updates.img/usr/lib64/python2.7/site-packages/pyanaconda/install.py
@@ -216,7 +216,7 @@ def doInstall(storage, payload, ksdata, instClass):
     args = file.readline().split()
     file.close()
 
-    if 'boss' in args:
+    if 'frontend' in args:
 	# If /export does not exist, create a symlink
 	# to /state/partition1. If /state/partition1 doesn't
 	# exist either, just ignore
diff --git a/redhat/src/stack/images/7.1708/updates.img/usr/sbin/anaconda-stacki b/redhat/src/stack/images/7.1708/updates.img/usr/sbin/anaconda-stacki
index e16e7cb08..6ea3796fb 100755
--- a/redhat/src/stack/images/7.1708/updates.img/usr/sbin/anaconda-stacki
+++ b/redhat/src/stack/images/7.1708/updates.img/usr/sbin/anaconda-stacki
@@ -74,7 +74,7 @@ ludicrous_proc = subprocess.Popen(['/opt/stack/bin/ludicrous-client.py'], env=en
 # give ludicrous a chance to start
 time.sleep(5)
 
-if 'boss' in args:
+if 'frontend' in args:
 	# We are a frontend
 
 	# Check to see if there's a user-specified