Bug 1288590

Description of problem:
When a guest instance based on mariadb 5.5 (the default one shipped with RHEL) is started, the default configuration coming from the mariadb template contains two errors which prevent mariadb from starting.

The template file is: trove/templates/mariadb/config.template

Errors found:

pid_file = /var/run/mysqld/mysqld.pid
-> the directory /var/run/mysqld is not provided by mariadb-server-5.5.44-2.el7.x86_64 (it is provided by mariadb-galera-server-5.5.42-1.el7ost.x86_64 though). The temporary directory should be /var/run/maridb/ (so probably the default is a good choice, /var/run/mariadb/mariadb.pid )

!includedir /etc/my.conf.d/
-> the directory does not exist with both mariadb-server 5.5 and mariadb-galera-server 5.5; it should be /etc/my.cnf.d



Version-Release number of selected component (if applicable):
openstack-trove-common-4.0.0-2.el7ost.noarch
openstack-trove-guestagent-4.0.0-2.el7ost.noarch
python-trove-4.0.0-2.el7ost.noarch


How reproducible:

Steps to Reproduce:
1. Define a mariadb 5.5 datastore, with an associated instance with mariadb-server package preloaded (in addition to the guest agent, of course).
2. Create an trove instance based on mariadb 5.5

Actual results:
The instance move to SHUTDOWN and the mariadb server can't start; the reported errors include:

Initialization of MySQL database failed.
Perhaps /etc/my.cnf is misconfigured.


Expected results:
Instance in ACTIVE state.

Instances moves to ACTIVE state if the two parameters are fixes as described above in the templates included with the image.