diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-10 17:01:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-10 17:01:13 +0000 |
| commit | 6fe7a825f68490b5b20e47de06d4fe7a9ab16a02 (patch) | |
| tree | ce974f1f85ec06898d5896dfb02e93044981f733 | |
| parent | 8dd96ee8a71313a2cea3459a5ca0366b8260b1d7 (diff) | |
| parent | 001868a0be60a033d05570b4e13d40b79f5fbda4 (diff) | |
Merge "Move mistral into services-docker"
| -rw-r--r-- | environments/docker.yaml | 3 | ||||
| -rw-r--r-- | environments/services-docker/mistral.yaml | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml index 01874fae..38c16a7e 100644 --- a/environments/docker.yaml +++ b/environments/docker.yaml @@ -27,9 +27,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::MistralApi: ../docker/services/mistral-api.yaml - OS::TripleO::Services::MistralEngine: ../docker/services/mistral-engine.yaml - OS::TripleO::Services::MistralExecutor: ../docker/services/mistral-executor.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 diff --git a/environments/services-docker/mistral.yaml b/environments/services-docker/mistral.yaml new file mode 100644 index 00000000..a215d2a0 --- /dev/null +++ b/environments/services-docker/mistral.yaml @@ -0,0 +1,4 @@ +resource_registry: + OS::TripleO::Services::MistralEngine: ../../docker/services/mistral-engine.yaml + OS::TripleO::Services::MistralApi: ../../docker/services/mistral-api.yaml + OS::TripleO::Services::MistralExecutor: ../../docker/services/mistral-executor.yaml |