diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-13 00:02:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-13 00:02:21 +0000 |
| commit | d6adc5a5f2cf6e438b19dd32bd13d6d3c9701614 (patch) | |
| tree | 9d09b7c60b83a6da752a02af512aabe15e6f6084 /environments | |
| parent | f6ea8c731a7f66b77fc0b0da8311918fb4e3c43d (diff) | |
| parent | 89ee8828b414115deaf306a01462fc03501b694b (diff) | |
Merge "Move zaqar into services-docker"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/docker.yaml | 2 | ||||
| -rw-r--r-- | environments/services-docker/zaqar.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml index 38c16a7e..2a1215a2 100644 --- a/environments/docker.yaml +++ b/environments/docker.yaml @@ -19,7 +19,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 @@ -27,7 +26,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 index 00000000..ca0b3b15 --- /dev/null +++ b/environments/services-docker/zaqar.yaml @@ -0,0 +1,2 @@ +resource_registry: + OS::TripleO::Services::Zaqar: ../../docker/services/zaqar.yaml |