aboutsummaryrefslogtreecommitdiffstats
path: root/environments/docker.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2017-03-08 15:29:45 -0500
committerDan Prince <dprince@redhat.com>2017-03-08 15:29:45 -0500
commit89ee8828b414115deaf306a01462fc03501b694b (patch)
treec8c640456310830e6ea871a031407d90025877be /environments/docker.yaml
parent001868a0be60a033d05570b4e13d40b79f5fbda4 (diff)
Move zaqar into services-docker
This patch moves enabling Zaqar docker services into a separate environment in the environments/services-docker directory. Change-Id: I6755eb7ae2abb2b9c8b213ff6fd21b0392353ef5
Diffstat (limited to 'environments/docker.yaml')
-rw-r--r--environments/docker.yaml2
1 files changed, 0 insertions, 2 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml
index 3e0ad271..1d816d34 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -17,7 +17,6 @@ resource_registry:
OS::TripleO::Services::NovaPlacement: ../docker/services/nova-placement.yaml
OS::TripleO::Services::NovaConductor: ../docker/services/nova-conductor.yaml
OS::TripleO::Services::NovaScheduler: ../docker/services/nova-scheduler.yaml
- # FIXME: these need to go into a environments/services-docker dir?
OS::TripleO::Services::NeutronServer: ../docker/services/neutron-api.yaml
OS::TripleO::Services::NeutronApi: ../docker/services/neutron-api.yaml
OS::TripleO::Services::NeutronCorePlugin: ../docker/services/neutron-plugin-ml2.yaml
@@ -25,7 +24,6 @@ resource_registry:
OS::TripleO::Services::NeutronDhcpAgent: ../docker/services/neutron-dhcp.yaml
OS::TripleO::Services::NeutronL3Agent: ../docker/services/neutron-l3.yaml
OS::TripleO::Services::MySQL: ../docker/services/database/mysql.yaml
- OS::TripleO::Services::Zaqar: ../docker/services/zaqar.yaml
OS::TripleO::Services::RabbitMQ: ../docker/services/rabbitmq.yaml
OS::TripleO::Services::MongoDb: ../docker/services/database/mongodb.yaml
OS::TripleO::Services::Memcached: ../docker/services/memcached.yaml