diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-09-07 05:34:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-09-07 05:34:35 +0000 |
| commit | a38bd9eee95eecb6665d1529c3a24b33af50ed5a (patch) | |
| tree | 724a6c85433bafa24dcbdb31176da645e81e91c6 /environments | |
| parent | efe83884e087dd29bf0fcfff3e6f58080da28aaa (diff) | |
| parent | e33d9181e4b75a54968b0821375a2564ff8ceab9 (diff) | |
Merge "Containerized mongodb, disable by default, fix upgrade" into stable/pike
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/docker.yaml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml index dfa30b08..67e8a496 100644 --- a/environments/docker.yaml +++ b/environments/docker.yaml @@ -30,7 +30,6 @@ resource_registry: OS::TripleO::Services::HAproxy: ../docker/services/haproxy.yaml OS::TripleO::Services::MySQL: ../docker/services/database/mysql.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 OS::TripleO::Services::Memcached: ../docker/services/memcached.yaml OS::TripleO::Services::SwiftProxy: ../docker/services/swift-proxy.yaml |