diff --git a/clusters/cl01tl/manifests/rook-ceph/Deployment-rook-ceph-tools.yaml b/clusters/cl01tl/manifests/rook-ceph/Deployment-rook-ceph-tools.yaml index 2e13781aa..e3cc334a6 100644 --- a/clusters/cl01tl/manifests/rook-ceph/Deployment-rook-ceph-tools.yaml +++ b/clusters/cl01tl/manifests/rook-ceph/Deployment-rook-ceph-tools.yaml @@ -28,6 +28,7 @@ spec: CEPH_CONFIG="/etc/ceph/ceph.conf" MON_CONFIG="/etc/rook/mon-endpoints" KEYRING_FILE="/etc/ceph/keyring" + CONFIG_OVERRIDE="/etc/rook-config-override/config" # create a ceph config file in its default location so ceph/rados tools can be used # without specifying any arguments @@ -48,6 +49,13 @@ spec: [client.admin] keyring = ${KEYRING_FILE} EOF + + # Merge the config override if it exists and is not empty + if [ -f "${CONFIG_OVERRIDE}" ] && [ -s "${CONFIG_OVERRIDE}" ]; then + echo "$DATE merging config override from ${CONFIG_OVERRIDE}" + echo "" >> ${CEPH_CONFIG} + cat ${CONFIG_OVERRIDE} >> ${CEPH_CONFIG} + fi } # watch the endpoints config file and update if the mon endpoints ever change @@ -113,6 +121,9 @@ spec: mountPath: /etc/rook - name: ceph-admin-secret mountPath: /var/lib/rook-ceph-mon + - name: rook-config-override + mountPath: /etc/rook-config-override + readOnly: true serviceAccountName: rook-ceph-default volumes: - name: ceph-admin-secret @@ -128,6 +139,10 @@ spec: items: - key: data path: mon-endpoints + - name: rook-config-override + configMap: + name: rook-config-override + optional: true - name: ceph-config emptyDir: {} tolerations: diff --git a/clusters/cl01tl/manifests/rook-ceph/Role-rook-ceph-mgr.yaml b/clusters/cl01tl/manifests/rook-ceph/Role-rook-ceph-mgr.yaml index 592df8289..dafa42977 100644 --- a/clusters/cl01tl/manifests/rook-ceph/Role-rook-ceph-mgr.yaml +++ b/clusters/cl01tl/manifests/rook-ceph/Role-rook-ceph-mgr.yaml @@ -43,6 +43,7 @@ rules: resources: - cephclients - cephclusters + - cephclusters/finalizers - cephblockpools - cephfilesystems - cephnfses