aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorSteve Baker <sbaker@redhat.com>2017-09-05 11:23:22 +1200
committerEmilien Macchi <emilien@redhat.com>2017-09-06 06:47:29 +0000
commite33d9181e4b75a54968b0821375a2564ff8ceab9 (patch)
treece0092bba0a84e3f71f6224fdb15456d6288aa8c /docker
parent1b3264c2ad7a5ac3cfdf3f37dd6e899ee7063cfa (diff)
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 cb81cbe3b5f3887f5d690c590e52b728f74d43c3)
Diffstat (limited to 'docker')
-rw-r--r--docker/services/database/mongodb.yaml4
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml
index 9b5c5b8..d6bba20 100644
--- a/docker/services/database/mongodb.yaml
+++ b/docker/services/database/mongodb.yaml
@@ -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