Merge "Generate MySQL client config if service requires database"

diff --cc docker/services/cinder-api.yaml
Simple merge

diff --cc docker/services/nova-api.yaml
Simple merge

diff --cc docker/services/nova-placement.yaml
Simple merge

diff --cc docker/services/zaqar.yaml
Simple merge

diff --cc environments/docker.yaml
index 2c09483,34285ef..0972da6
--- 1/environments/docker.yaml
--- 2/environments/docker.yaml
+++ b/environments/docker.yaml
@@@ -32,9 -32,7 +32,8 @@@ resource_registry
    OS::TripleO::Services::NeutronOvsAgent: ../docker/services/neutron-ovs-agent.yaml
    OS::TripleO::Services::NeutronDhcpAgent: ../docker/services/neutron-dhcp.yaml
    OS::TripleO::Services::NeutronL3Agent: ../docker/services/neutron-l3.yaml
 +  OS::TripleO::Services::HAproxy: ../docker/services/haproxy.yaml
    OS::TripleO::Services::MySQL: ../docker/services/database/mysql.yaml
-   OS::TripleO::Services::MySQLClient: ../docker/services/database/mysql-client.yaml
    OS::TripleO::Services::RabbitMQ: ../docker/services/rabbitmq.yaml
    OS::TripleO::Services::MongoDb: ../docker/services/database/mongodb.yaml
    OS::TripleO::Services::Redis: ../docker/services/database/redis.yaml