Ceph: Make mon deployment compatible with k8s >= 1.10
This PS updates the ceph chart to work with newer versions of K8s which always mounts configmaps as read-only. Change-Id: If96dec4af385ed1ce210f2d4f63e09c89ec82c76
This commit is contained in:
parent
a092302356
commit
6c8041b15f
@ -68,9 +68,11 @@ get_mon_config
|
||||
|
||||
# If we don't have a monitor keyring, this is a new monitor
|
||||
if [ ! -e "${MON_DATA_DIR}/keyring" ]; then
|
||||
if [ ! -e ${MON_KEYRING} ]; then
|
||||
echo "ERROR- ${MON_KEYRING} must exist. You can extract it from your current monitor by running 'ceph auth get mon. -o ${MON_KEYRING}' or use a KV Store"
|
||||
if [ ! -e ${MON_KEYRING}.seed ]; then
|
||||
echo "ERROR- ${MON_KEYRING}.seed must exist. You can extract it from your current monitor by running 'ceph auth get mon. -o ${MON_KEYRING}' or use a KV Store"
|
||||
exit 1
|
||||
else
|
||||
cp -vf ${MON_KEYRING}.seed ${MON_KEYRING}
|
||||
fi
|
||||
|
||||
if [ ! -e ${MONMAP} ]; then
|
||||
|
@ -161,21 +161,21 @@ spec:
|
||||
subPath: ceph.client.admin.keyring
|
||||
readOnly: true
|
||||
- name: ceph-mon-keyring
|
||||
mountPath: /etc/ceph/ceph.mon.keyring
|
||||
mountPath: /etc/ceph/ceph.mon.keyring.seed
|
||||
subPath: ceph.mon.keyring
|
||||
readOnly: false
|
||||
readOnly: true
|
||||
- name: ceph-bootstrap-osd-keyring
|
||||
mountPath: /var/lib/ceph/bootstrap-osd/ceph.keyring
|
||||
subPath: ceph.keyring
|
||||
readOnly: false
|
||||
readOnly: true
|
||||
- name: ceph-bootstrap-mds-keyring
|
||||
mountPath: /var/lib/ceph/bootstrap-mds/ceph.keyring
|
||||
subPath: ceph.keyring
|
||||
readOnly: false
|
||||
readOnly: true
|
||||
- name: ceph-bootstrap-rgw-keyring
|
||||
mountPath: /var/lib/ceph/bootstrap-rgw/ceph.keyring
|
||||
subPath: ceph.keyring
|
||||
readOnly: false
|
||||
readOnly: true
|
||||
- name: pod-var-lib-ceph
|
||||
mountPath: /var/lib/ceph
|
||||
readOnly: false
|
||||
|
Loading…
Reference in New Issue
Block a user