From d3c3c35365016854575fadb085a67752ac9d13ee Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Fri, 8 Feb 2019 16:05:43 -0600
Subject: [PATCH] Libvirt: Move ceph config to remain on host

Change-Id: If525389191b82dc7fb10cd2941bbe48fb0bbdb3c
Signed-off-by: Pete Birley <pete@port.direct>
---
 libvirt/templates/bin/_ceph-keyring.sh.tpl |  2 ++
 libvirt/templates/daemonset-libvirt.yaml   | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/libvirt/templates/bin/_ceph-keyring.sh.tpl b/libvirt/templates/bin/_ceph-keyring.sh.tpl
index d7007d566..02a382c3b 100644
--- a/libvirt/templates/bin/_ceph-keyring.sh.tpl
+++ b/libvirt/templates/bin/_ceph-keyring.sh.tpl
@@ -19,6 +19,8 @@ limitations under the License.
 set -ex
 export HOME=/tmp
 
+cp -fv /etc/ceph/ceph.conf.template /etc/ceph/ceph.conf
+
 KEYRING=/etc/ceph/ceph.client.${CEPH_CINDER_USER}.keyring
 {{- if .Values.conf.ceph.cinder.keyring }}
 cat > ${KEYRING} <<EOF
diff --git a/libvirt/templates/daemonset-libvirt.yaml b/libvirt/templates/daemonset-libvirt.yaml
index b975b8de9..74e6091d2 100644
--- a/libvirt/templates/daemonset-libvirt.yaml
+++ b/libvirt/templates/daemonset-libvirt.yaml
@@ -100,7 +100,7 @@ spec:
               subPath: ceph-keyring.sh
               readOnly: true
             - name: ceph-etc
-              mountPath: /etc/ceph/ceph.conf
+              mountPath: /etc/ceph/ceph.conf.template
               subPath: ceph.conf
               readOnly: true
 {{- end }}
@@ -174,10 +174,9 @@ spec:
             {{- if .Values.conf.ceph.enabled }}
             - name: etcceph
               mountPath: /etc/ceph
-            - name: ceph-etc
-              mountPath: /etc/ceph/ceph.conf
-              subPath: ceph.conf
-              readOnly: true
+              {{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "10" ) }}
+              mountPropagation: Bidirectional
+              {{- end }}
             {{- if empty .Values.conf.ceph.cinder.keyring }}
             - name: ceph-keyring
               mountPath: /tmp/client-keyring
@@ -197,7 +196,8 @@ spec:
             defaultMode: 0444
         {{- if .Values.conf.ceph.enabled }}
         - name: etcceph
-          emptyDir: {}
+          hostPath:
+            path: /var/lib/openstack-helm/compute/libvirt
         - name: ceph-etc
           configMap:
             name: {{ .Values.ceph_client.configmap }}