Containerized mongodb, disable by default, fix upgrade
This change removes the entry to containerise docker by default
because it should now be disabled since the change
Id2e6550fb7c319fc52469644ea022cf35757e0ce.
Removing the entry means the default mapping to mongodb-disabled.yaml
takes effect.
This change also modifies the upgrade_tasks so that the mongod service
is only disabled when the service exists. There appears to be upgrade
scenarios which fail because mongodb was never installed in the first
place.
Change-Id: Ie09ce2a52128eef157e4d768c1c4776fc49f2324
Closes-Bug: #1715031
(cherry picked from commit cb81cbe3b5
)
This commit is contained in:
parent
1b3264c2ad
commit
e33d9181e4
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user