From: Jan Provaznik <jprovazn@redhat.com>
Date: Mon, 28 Aug 2017 15:09:00 +0000 (+0200)
Subject: Remove src_ceph from manila kolla_config
X-Git-Tag: opnfv-6.0.0~174^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ee9197a6999a8dbc0f83b360eae94e4f8838c6bc;p=apex-tripleo-heat-templates.git

Remove src_ceph from manila kolla_config

Pacemaker puppet module takes care of mounting /etc/ceph into
manila-share container (I23b6890b4cf7f1e6fe84b6be280dde82218275fc).

Change-Id: I1026b2436275b17cfe3ac85192d42c5268f0a630
Related-To: I23b6890b4cf7f1e6fe84b6be280dde82218275fc
(cherry picked from commit 0d8040ca33d42dbb7e06162f2b659ff6cbc0316f)
---

diff --git a/docker/services/pacemaker/manila-share.yaml b/docker/services/pacemaker/manila-share.yaml
index c88737aa..805f101c 100644
--- a/docker/services/pacemaker/manila-share.yaml
+++ b/docker/services/pacemaker/manila-share.yaml
@@ -89,11 +89,6 @@ outputs:
               dest: "/"
               merge: true
               preserve_properties: true
-            # NOTE(gfidente): ceph ansible generated
-            - source: "/var/lib/kolla/config_files/src-ceph/"
-              dest: "/etc/ceph"
-              merge: true
-              preserve_properties: true
           permissions:
             - path: /var/log/manila
               owner: manila:manila