my.cnf template file missing includedir for conf.d

[Paul Marshall]

In order to override the default my.cnf settings it needs to specify includedir (e.g. !includedir /etc/mysql/conf.d/).

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/44451

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/44451
Committed: http://github.com/openstack/trove/commit/8ee9e9ce143377a82e13f45a02a2c8aa06225d57
Submitter: Jenkins
Branch: master

commit 8ee9e9ce143377a82e13f45a02a2c8aa06225d57
Author: Paul Marshall <email address hidden>
Date: Fri Aug 30 07:43:52 2013 -0500

    Adds includedir back to templates

    This adds includedir to the mysql templates, which allows overriding of
    default my.cnf settings. Additionally, /etc/mysql/conf.d is created if it
    doesn't already exist to prevent mysql from failing.

    Change-Id: I1e051978b2363eaa9fd11abf1b107bd1e9c0edcb
    Fixes: bug #1218613