Permalink
Browse files

Don't check if the appliance is a 'frontend' if we are trying to star…

…t the database. This

allows us to create other appliances that need a database and still get to use this code.
  • Loading branch information...
gregorybruno committed Nov 14, 2017
1 parent 266314d commit ba9f74d46d8ea3ec3da3e3d66a109686d543c19c
Showing with 6 additions and 13 deletions.
  1. +6 −13 common/nodes/database.xml
View
@@ -94,21 +94,14 @@ password = $apache_pw
-->
/opt/stack/sbin/mysql-install-db
systemctl enable mariadb
/usr/bin/systemctl enable mariadb
/usr/bin/systemctl start mariadb
grep frontend /proc/cmdline > /dev/null 2>&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 &
else
/usr/bin/systemctl start mariadb
<!-- may have to manually start the database -->
if [ $? -ne 0 ] ; then
nohup /opt/stack/sbin/mysqld --defaults-file=/opt/stack/etc/my.cnf.d/server.cnf --basedir=/opt/stack --datadir=/var/opt/stack/mysql --user=stackdb &amp;
fi
<!--
Make sure that the database is
up and running

0 comments on commit ba9f74d

Please sign in to comment.