[ceph-mon] Allow for unconditional mon restart
This change allows mons to be restarted unconditionally by the ceph-mon chart. This can be useful in upgrade scenarios where ceph-mon pods need to be forcibly restarted for any reason. Change-Id: I93a1426c2ca02b060f7a606495893feb2813c142
This commit is contained in:
parent
fce7ca38ae
commit
13fd81b8d9
@ -15,6 +15,6 @@ apiVersion: v1
|
|||||||
appVersion: v1.0.0
|
appVersion: v1.0.0
|
||||||
description: OpenStack-Helm Ceph Mon
|
description: OpenStack-Helm Ceph Mon
|
||||||
name: ceph-mon
|
name: ceph-mon
|
||||||
version: 0.1.24
|
version: 0.1.25
|
||||||
home: https://github.com/ceph/ceph
|
home: https://github.com/ceph/ceph
|
||||||
...
|
...
|
||||||
|
@ -118,8 +118,8 @@ done
|
|||||||
|
|
||||||
echo "Latest revision of the helm chart(s) is : $max_release"
|
echo "Latest revision of the helm chart(s) is : $max_release"
|
||||||
|
|
||||||
if [[ $max_release -gt 1 ]]; then
|
if [[ "$UNCONDITIONAL_MON_RESTART" == "true" ]] || [[ $max_release -gt 1 ]]; then
|
||||||
if [[ $require_upgrade -gt 0 ]]; then
|
if [[ "$UNCONDITIONAL_MON_RESTART" == "true" ]] || [[ $require_upgrade -gt 0 ]]; then
|
||||||
echo "Restart ceph-mon pods one at a time to prevent disruption"
|
echo "Restart ceph-mon pods one at a time to prevent disruption"
|
||||||
restart_mons
|
restart_mons
|
||||||
fi
|
fi
|
||||||
|
@ -100,6 +100,8 @@ spec:
|
|||||||
value: {{ .Release.Namespace }}
|
value: {{ .Release.Namespace }}
|
||||||
- name: RELEASE_GROUP_NAME
|
- name: RELEASE_GROUP_NAME
|
||||||
value: {{ .Release.Name }}
|
value: {{ .Release.Name }}
|
||||||
|
- name: UNCONDITIONAL_MON_RESTART
|
||||||
|
value: {{ .Values.conf.storage.unconditional_mon_restart | quote }}
|
||||||
command:
|
command:
|
||||||
- /tmp/post-apply.sh
|
- /tmp/post-apply.sh
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
|
@ -296,6 +296,11 @@ conf:
|
|||||||
mon:
|
mon:
|
||||||
directory: /var/lib/openstack-helm/ceph/mon
|
directory: /var/lib/openstack-helm/ceph/mon
|
||||||
|
|
||||||
|
# The post-apply job will try to determine if mons need to be restarted
|
||||||
|
# and only restart them if necessary. Set this value to "true" to restart
|
||||||
|
# mons unconditionally.
|
||||||
|
unconditional_mon_restart: "false"
|
||||||
|
|
||||||
daemonset:
|
daemonset:
|
||||||
prefix_name: "mon"
|
prefix_name: "mon"
|
||||||
|
|
||||||
|
@ -25,4 +25,5 @@ ceph-mon:
|
|||||||
- 0.1.22 Correct configmap names for all resources
|
- 0.1.22 Correct configmap names for all resources
|
||||||
- 0.1.23 Release-specific ceph-template configmap name
|
- 0.1.23 Release-specific ceph-template configmap name
|
||||||
- 0.1.24 Prevents mgr SA from repeated creation
|
- 0.1.24 Prevents mgr SA from repeated creation
|
||||||
|
- 0.1.25 Allow for unconditional mon restart
|
||||||
...
|
...
|
||||||
|
Loading…
Reference in New Issue
Block a user