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

diff --git a/environments/docker.yaml b/environments/docker.yaml
index 3e0ad27..1d816d3 100644 (file)
--- 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

diff --git a/environments/services-docker/zaqar.yaml b/environments/services-docker/zaqar.yaml
new file mode 100644 (file)
index 0000000..ca0b3b1
--- /dev/null
+++ b/environments/services-docker/zaqar.yaml
@@ -0,0 +1,2 @@
+resource_registry:
+  OS::TripleO::Services::Zaqar: ../../docker/services/zaqar.yaml