From: Jenkins Date: Tue, 1 Aug 2017 20:00:18 +0000 (+0000) Subject: Merge "Generate MySQL client config if service requires database" X-Git-Tag: opnfv-6.0.0~317 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=56d4563935ce51c54e8a4c38463e6c86dabee889;p=apex-tripleo-heat-templates.git Merge "Generate MySQL client config if service requires database" --- 56d4563935ce51c54e8a4c38463e6c86dabee889 diff --cc environments/docker.yaml index 2c09483a,34285ef8..0972da67 --- a/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