openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Add cephadm_adopt tag to the ceph related upgrade tasks" into stable/wallaby

This commit is contained in:
Zuul 2021-10-11 00:08:49 +00:00 committed by Gerrit Code Review
parent f556f24ad3 2956f10684
commit c4efe5ec07
11 changed files with 21 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
deployment/ceph-ansible/ceph-base.yaml
View File

@ -576,8 +576,7 @@ outputs:
when: step|int == 1
tags:
- ceph
- ceph_systemd
- ceph_fstobs
- cephadm_adopt
block:
- name: ensure ceph-ansible is installed
include_role:
@ -671,8 +670,7 @@ outputs:
when: step|int == 2
tags:
- ceph
- ceph_systemd
- ceph_fstobs
- cephadm_adopt
block:
- name: set ceph-ansible facts
set_fact:
@ -743,24 +741,8 @@ outputs:
- when: step|int == 0
tags:
- never
- ceph_systemd
- cephadm_adopt
block:
- name: stop if _limit is unset
fail:
msg: The ceph-ansible systemd units migration playbook limit is not set; please use -e ceph_ansible_limit=##nodename##
when: (ceph_ansible_limit is not defined) or (ceph_ansible_limit|length == 0)
- name: set ceph_ansible_playbooks_default
set_fact:
ceph_ansible_playbooks_default: ["/usr/share/ceph-ansible/infrastructure-playbooks/docker-to-podman.yml"]
- when: step|int == 0
tags:
- never
- ceph_fstobs
block:
- name: stop if _limit is unset
fail:
msg: The ceph-ansible filestore to bluestore playbook limit is not set; please use -e ceph_ansible_limit=##nodename##
when: (ceph_ansible_limit is not defined) or (ceph_ansible_limit|length == 0)
- name: ensure ceph health is OK before proceeding
import_role:
role: ceph
@ -774,7 +756,14 @@ outputs:
- ceph_health
- name: set ceph_ansible_playbooks_default
set_fact:
ceph_ansible_playbooks_default: ["/usr/share/ceph-ansible/infrastructure-playbooks/filestore-to-bluestore.yml"]
ceph_ansible_playbooks_default: ["/usr/share/ceph-ansible/infrastructure-playbooks/cephadm-adopt.yml"]
- name: Skip the nfs cephadm-adopt section
set_fact:
ceph_ansible_skip_tags:
list_join:
- ','
- - get_param: CephAnsibleSkipTags
- 'ceph_nfs_adopt'
- when: step|int == 0
tags: ceph
block:

3
deployment/ceph-ansible/ceph-client.yaml
View File

@ -53,8 +53,7 @@ outputs:
when: step|int == 1
tags:
- ceph
- ceph_fstobs
- ceph_systemd
- cephamd_adopt
block:
- name: set ceph-ansible group vars clients
set_fact:

3
deployment/ceph-ansible/ceph-external.yaml
View File

@ -58,8 +58,7 @@ outputs:
when: step|int == 1
tags:
- ceph
- ceph_fstobs
- ceph_systemd
- cephadm_adopt
block:
- name: set ceph-ansible group vars clients
set_fact:

3
deployment/ceph-ansible/ceph-grafana.yaml
View File

@ -125,8 +125,7 @@ outputs:
when: step == '1'
tags:
- ceph
- ceph_fstobs
- ceph_systemd
- cephadm_adopt
block:
- name: set ceph-ansible group vars
set_fact:

3
deployment/ceph-ansible/ceph-mds.yaml
View File

@ -67,8 +67,7 @@ outputs:
when: step|int == 1
tags:
- ceph
- ceph_fstobs
- ceph_systemd
- cephadm_adopt
block:
- name: set ceph-ansible group vars mdss
set_fact:

3
deployment/ceph-ansible/ceph-mgr.yaml
View File

@ -118,8 +118,7 @@ outputs:
when: step|int == 1
tags:
- ceph
- ceph_fstobs
- ceph_systemd
- cephadm_adopt
block:
- name: set ceph-ansible group vars mgrs
set_fact:

3
deployment/ceph-ansible/ceph-mon.yaml
View File

@ -89,8 +89,7 @@ outputs:
when: step|int == 1
tags:
- ceph
- ceph_fstobs
- ceph_systemd
- cephadm_adopt
block:
- name: set ceph-ansible group vars mons
set_fact:

3
deployment/ceph-ansible/ceph-nfs.yaml
View File

@ -112,8 +112,7 @@ outputs:
when: step|int == 1
tags:
- ceph
- ceph_fstobs
- ceph_systemd
- cephadm_adopt
block:
- name: set ceph-ansible group vars nfss
set_fact:

3
deployment/ceph-ansible/ceph-osd.yaml
View File

@ -123,8 +123,7 @@ outputs:
when: step|int == 1
tags:
- ceph
- ceph_fstobs
- ceph_systemd
- cephadm_adopt
block:
- name: set ceph-ansible group vars osds
set_fact:

3
deployment/ceph-ansible/ceph-rbdmirror.yaml
View File

@ -80,8 +80,7 @@ outputs:
when: step|int == 1
tags:
- ceph
- ceph_fstobs
- ceph_systemd
- cephadm_adopt
block:
- name: set ceph-ansible group vars rbdmirrors
set_fact:

3
deployment/ceph-ansible/ceph-rgw.yaml
View File

@ -120,8 +120,7 @@ outputs:
when: step|int == 1
tags:
- ceph
- ceph_fstobs
- ceph_systemd
- cephadm_adopt
block:
- name: set ceph-ansible group vars rgws
set_fact: