openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Containerized mongodb, disable by default, fix upgrade" into stable/pike

This commit is contained in:
Jenkins 2017-09-07 05:34:35 +00:00 committed by Gerrit Code Review
parent efe83884e0 e33d9181e4
commit a38bd9eee9
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/services/database/mongodb.yaml
View File

@ -157,6 +157,10 @@ outputs:
metadata_settings:
get_attr: [MongodbPuppetBase, role_data, metadata_settings]
upgrade_tasks:
- name: Check for mongodb service
stat: path=/usr/lib/systemd/system/mongod.service
register: mongod_service
- name: Stop and disable mongodb service
tags: step2
service: name=mongod state=stopped enabled=no
when: mongod_service.stat.exists

1
environments/docker.yaml
View File

@ -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

4
puppet/services/disabled/mongodb-disabled.yaml
View File

@ -37,6 +37,10 @@ outputs:
value:
service_name: mongodb_disabled
upgrade_tasks:
- name: Check for mongodb service
stat: path=/usr/lib/systemd/system/mongod.service
register: mongod_service
- name: Stop and disable mongodb service on upgrade
tags: step1
service: name=mongod state=stopped enabled=no
when: mongod_service.stat.exists