From 84901ac56db1647e40fe0015983653e48ff90f5b Mon Sep 17 00:00:00 2001
From: Huamin Chen <hchen@redhat.com>
Date: Fri, 8 Sep 2017 13:20:57 -0400
Subject: [PATCH] Ceph: RGW and MDS deployment fixes
fix ceph.conf path in RGW
add variables_entrypoint.sh to MDS and RGW deployment
Change-Id: Ic977e397e3534b71eb17f7de4199ba31c343a0ba
Signed-off-by: Huamin Chen <hchen@redhat.com>
---
ceph/templates/deployment-mds.yaml | 4 ++++
ceph/templates/deployment-rgw.yaml | 6 +++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/ceph/templates/deployment-mds.yaml b/ceph/templates/deployment-mds.yaml
index 304cc36784..7fc7909d48 100644
--- a/ceph/templates/deployment-mds.yaml
+++ b/ceph/templates/deployment-mds.yaml
@@ -85,6 +85,10 @@ spec:
mountPath: /start_mds.sh
subPath: start_mds.sh
readOnly: true
+ - name: ceph-bin
+ mountPath: /variables_entrypoint.sh
+ subPath: variables_entrypoint.sh
+ readOnly: true
- name: ceph-bin
mountPath: /common_functions.sh
subPath: common_functions.sh
diff --git a/ceph/templates/deployment-rgw.yaml b/ceph/templates/deployment-rgw.yaml
index 92fda43f38..6afc65d8d5 100644
--- a/ceph/templates/deployment-rgw.yaml
+++ b/ceph/templates/deployment-rgw.yaml
@@ -118,7 +118,7 @@ spec:
mountPath: /etc/ceph
{{- if not .Values.ceph.rgw_keystone_auth }}
- name: ceph-etc
- mountPath: /ceph/ceph.conf
+ mountPath: /etc/ceph/ceph.conf
subPath: ceph.conf
readOnly: true
{{- end }}
@@ -126,6 +126,10 @@ spec:
mountPath: /start_rgw.sh
subPath: start_rgw.sh
readOnly: true
+ - name: ceph-bin
+ mountPath: /variables_entrypoint.sh
+ subPath: variables_entrypoint.sh
+ readOnly: true
- name: ceph-bin
mountPath: /common_functions.sh
subPath: common_functions.sh