Merge "Containerized mongodb, disable by default, fix upgrade" into stable/pike
This commit is contained in:
commit
a38bd9eee9
|
@ -157,6 +157,10 @@ outputs:
|
||||||
metadata_settings:
|
metadata_settings:
|
||||||
get_attr: [MongodbPuppetBase, role_data, metadata_settings]
|
get_attr: [MongodbPuppetBase, role_data, metadata_settings]
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
- name: Check for mongodb service
|
||||||
|
stat: path=/usr/lib/systemd/system/mongod.service
|
||||||
|
register: mongod_service
|
||||||
- name: Stop and disable mongodb service
|
- name: Stop and disable mongodb service
|
||||||
tags: step2
|
tags: step2
|
||||||
service: name=mongod state=stopped enabled=no
|
service: name=mongod state=stopped enabled=no
|
||||||
|
when: mongod_service.stat.exists
|
||||||
|
|
|
@ -30,7 +30,6 @@ resource_registry:
|
||||||
OS::TripleO::Services::HAproxy: ../docker/services/haproxy.yaml
|
OS::TripleO::Services::HAproxy: ../docker/services/haproxy.yaml
|
||||||
OS::TripleO::Services::MySQL: ../docker/services/database/mysql.yaml
|
OS::TripleO::Services::MySQL: ../docker/services/database/mysql.yaml
|
||||||
OS::TripleO::Services::RabbitMQ: ../docker/services/rabbitmq.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::Redis: ../docker/services/database/redis.yaml
|
||||||
OS::TripleO::Services::Memcached: ../docker/services/memcached.yaml
|
OS::TripleO::Services::Memcached: ../docker/services/memcached.yaml
|
||||||
OS::TripleO::Services::SwiftProxy: ../docker/services/swift-proxy.yaml
|
OS::TripleO::Services::SwiftProxy: ../docker/services/swift-proxy.yaml
|
||||||
|
|
|
@ -37,6 +37,10 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: mongodb_disabled
|
service_name: mongodb_disabled
|
||||||
upgrade_tasks:
|
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
|
- name: Stop and disable mongodb service on upgrade
|
||||||
tags: step1
|
tags: step1
|
||||||
service: name=mongod state=stopped enabled=no
|
service: name=mongod state=stopped enabled=no
|
||||||
|
when: mongod_service.stat.exists
|
||||||
|
|
Loading…
Reference in New Issue