From: Damien Ciabrini <dciabrin@redhat.com>
Date: Wed, 9 Aug 2017 07:25:42 +0000 (+0000)
Subject: Fix metadata_settings in containerized mongodb
X-Git-Tag: opnfv-6.0.0~262^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=630ce41fe329c351c5aa80f579c9985c5e5508fb;p=apex-tripleo-heat-templates.git

Fix metadata_settings in containerized mongodb

The containerized version of the mongodb service omits the
metadata_settings definition [1], which confuses certmonger when
internal TLS is enabled and make the generation of certificates fail.

Use the right setting from the non-containerized profile.

[1] https://review.openstack.org/#/c/461780/

Change-Id: I50a9a3a822ba5ef5d2657a12c359b51b7a3a42f2
Closes-Bug: #1709553
---

diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml
index 5ba79b31..86bb6d54 100644
--- a/docker/services/database/mongodb.yaml
+++ b/docker/services/database/mongodb.yaml
@@ -116,6 +116,8 @@ outputs:
           with_items:
             - /var/log/containers/mongodb
             - /var/lib/mongodb
+      metadata_settings:
+        get_attr: [MongodbPuppetBase, role_data, metadata_settings]
       upgrade_tasks:
         - name: Stop and disable mongodb service
           tags: step2