Use Ceph cluster name when setting minimum client version
If CephClusterName is set to it's non-default value, then I4c3d8fee6c7a0c25cca4d1e6b731060684cd28b3 will cause the deployment to fail as per the bug this patch closes. Change-Id: Ia5611d7cb64808ac247873023e5aa5afd07f6698 Closes-Bug: #1915197 (cherry picked from commit8149df4c6e
) (cherry picked from commit5e4d71b213
)
This commit is contained in:
parent
d8bd7cba9c
commit
b188630e87
|
@ -42,6 +42,15 @@ parameters:
|
||||||
type: boolean
|
type: boolean
|
||||||
default: false
|
default: false
|
||||||
description: Parameter used to trigger the dashboard deployment.
|
description: Parameter used to trigger the dashboard deployment.
|
||||||
|
CephClusterName:
|
||||||
|
type: string
|
||||||
|
default: ceph
|
||||||
|
description: The Ceph cluster name.
|
||||||
|
constraints:
|
||||||
|
- allowed_pattern: "[a-zA-Z0-9]+"
|
||||||
|
description: >
|
||||||
|
The Ceph cluster name must be at least 1 character and contain only
|
||||||
|
letters and numbers.
|
||||||
|
|
||||||
conditions:
|
conditions:
|
||||||
dashboard_enabled: {equals: [{get_param: CephEnableDashboard}, true]}
|
dashboard_enabled: {equals: [{get_param: CephEnableDashboard}, true]}
|
||||||
|
@ -123,7 +132,9 @@ outputs:
|
||||||
register: ceph_mon_id
|
register: ceph_mon_id
|
||||||
delegate_to: "{{ groups['ceph_mon'][0] }}"
|
delegate_to: "{{ groups['ceph_mon'][0] }}"
|
||||||
- name: Enforce minimum Ceph clients version to Mimic
|
- name: Enforce minimum Ceph clients version to Mimic
|
||||||
command: "{{ container_cli }} exec {{ ceph_mon_id.stdout_lines[0] }} ceph osd set-require-min-compat-client mimic"
|
command: "{{ container_cli }} exec {{ ceph_mon_id.stdout_lines[0] }} ceph --cluster {{ cluster }} osd set-require-min-compat-client mimic"
|
||||||
delegate_to: "{{ groups['ceph_mon'][0] }}"
|
delegate_to: "{{ groups['ceph_mon'][0] }}"
|
||||||
|
vars:
|
||||||
|
cluster: {get_param: CephClusterName}
|
||||||
external_update_tasks: {get_attr: [CephBase, role_data, external_update_tasks]}
|
external_update_tasks: {get_attr: [CephBase, role_data, external_update_tasks]}
|
||||||
external_upgrade_tasks: {get_attr: [CephBase, role_data, external_upgrade_tasks]}
|
external_upgrade_tasks: {get_attr: [CephBase, role_data, external_upgrade_tasks]}
|
||||||
|
|
Loading…
Reference in New Issue