From 883d778f8ad0f78932c38da069727f48f8b9bb22 Mon Sep 17 00:00:00 2001 From: Francesco Pantano Date: Fri, 3 Jul 2020 17:18:06 +0200 Subject: [PATCH] Add filestore to bluestore migration tags Currently ceph-ansible assumes the cluster (which is updated to ceph4) is using bluestore just because it's the default on ceph-ansible. This patch adds some missing tags to make sure the variable contained in the heat stack are properly regenerated and the fs2bs playbook can be executed with the right variables. Change-Id: I373636bbc9d296f41b63de76719320727d3f4fb9 (cherry picked from commit c9cd67124fb758e9023395e5ae4f8223111e2e51) --- deployment/ceph-ansible/ceph-client.yaml | 5 ++++- deployment/ceph-ansible/ceph-external.yaml | 5 ++++- deployment/ceph-ansible/ceph-grafana.yaml | 5 ++++- deployment/ceph-ansible/ceph-mds.yaml | 5 ++++- deployment/ceph-ansible/ceph-mgr.yaml | 5 ++++- deployment/ceph-ansible/ceph-mon.yaml | 5 ++++- deployment/ceph-ansible/ceph-nfs.yaml | 5 ++++- deployment/ceph-ansible/ceph-osd.yaml | 5 ++++- deployment/ceph-ansible/ceph-rbdmirror.yaml | 5 ++++- deployment/ceph-ansible/ceph-rgw.yaml | 5 ++++- 10 files changed, 40 insertions(+), 10 deletions(-) diff --git a/deployment/ceph-ansible/ceph-client.yaml b/deployment/ceph-ansible/ceph-client.yaml index 64ac1fbdc9..45e20b24ec 100644 --- a/deployment/ceph-ansible/ceph-client.yaml +++ b/deployment/ceph-ansible/ceph-client.yaml @@ -65,7 +65,10 @@ outputs: - {get_attr: [CephBase, role_data, external_deploy_tasks]} - - name: ceph_client_external_deploy_init when: step|int == 1 - tags: ceph + tags: + - ceph + - ceph_fstobs + - ceph_systemd block: - name: set ceph-ansible group vars clients set_fact: diff --git a/deployment/ceph-ansible/ceph-external.yaml b/deployment/ceph-ansible/ceph-external.yaml index 110359ded1..8d1648fa81 100644 --- a/deployment/ceph-ansible/ceph-external.yaml +++ b/deployment/ceph-ansible/ceph-external.yaml @@ -71,7 +71,10 @@ outputs: - {get_attr: [CephBase, role_data, external_deploy_tasks]} - - name: ceph_external_external_deploy_init when: step|int == 1 - tags: ceph + tags: + - ceph + - ceph_fstobs + - ceph_systemd block: - name: set ceph-ansible group vars clients set_fact: diff --git a/deployment/ceph-ansible/ceph-grafana.yaml b/deployment/ceph-ansible/ceph-grafana.yaml index 436ae36aa4..e35c4af898 100644 --- a/deployment/ceph-ansible/ceph-grafana.yaml +++ b/deployment/ceph-ansible/ceph-grafana.yaml @@ -109,7 +109,10 @@ outputs: - {get_attr: [CephBase, role_data, external_deploy_tasks]} - - name: ceph_dashboard_external_deploy_init when: step == '1' - tags: ceph + tags: + - ceph + - ceph_fstobs + - ceph_systemd block: - name: set ceph-ansible group vars set_fact: diff --git a/deployment/ceph-ansible/ceph-mds.yaml b/deployment/ceph-ansible/ceph-mds.yaml index e83f44055f..e46fcb5cd4 100644 --- a/deployment/ceph-ansible/ceph-mds.yaml +++ b/deployment/ceph-ansible/ceph-mds.yaml @@ -72,7 +72,10 @@ outputs: - {get_attr: [CephBase, role_data, external_deploy_tasks]} - - name: ceph_mds_external_deploy_init when: step|int == 1 - tags: ceph + tags: + - ceph + - ceph_fstobs + - ceph_systemd block: - name: set ceph-ansible group vars mdss set_fact: diff --git a/deployment/ceph-ansible/ceph-mgr.yaml b/deployment/ceph-ansible/ceph-mgr.yaml index f4e492d4be..3567e9e6ce 100644 --- a/deployment/ceph-ansible/ceph-mgr.yaml +++ b/deployment/ceph-ansible/ceph-mgr.yaml @@ -98,7 +98,10 @@ outputs: - {get_attr: [CephBase, role_data, external_deploy_tasks]} - - name: ceph_mgr_external_deploy_init when: step|int == 1 - tags: ceph + tags: + - ceph + - ceph_fstobs + - ceph_systemd block: - name: set ceph-ansible group vars mgrs set_fact: diff --git a/deployment/ceph-ansible/ceph-mon.yaml b/deployment/ceph-ansible/ceph-mon.yaml index 2aa9655923..4c76158f46 100644 --- a/deployment/ceph-ansible/ceph-mon.yaml +++ b/deployment/ceph-ansible/ceph-mon.yaml @@ -80,7 +80,10 @@ outputs: - {get_attr: [CephBase, role_data, external_deploy_tasks]} - - name: ceph_mon_external_deploy_init when: step|int == 1 - tags: ceph + tags: + - ceph + - ceph_fstobs + - ceph_systemd block: - name: set ceph-ansible group vars mons set_fact: diff --git a/deployment/ceph-ansible/ceph-nfs.yaml b/deployment/ceph-ansible/ceph-nfs.yaml index 88d3b21082..7c5df1fe12 100644 --- a/deployment/ceph-ansible/ceph-nfs.yaml +++ b/deployment/ceph-ansible/ceph-nfs.yaml @@ -79,7 +79,10 @@ outputs: - {get_attr: [CephBase, role_data, external_deploy_tasks]} - - name: ceph_nfs_external_deploy_init when: step|int == 1 - tags: ceph + tags: + - ceph + - ceph_fstobs + - ceph_systemd block: - name: set ceph-ansible group vars nfss set_fact: diff --git a/deployment/ceph-ansible/ceph-osd.yaml b/deployment/ceph-ansible/ceph-osd.yaml index d53b33ed0b..597663ca47 100644 --- a/deployment/ceph-ansible/ceph-osd.yaml +++ b/deployment/ceph-ansible/ceph-osd.yaml @@ -86,7 +86,10 @@ outputs: - {get_attr: [CephBase, role_data, external_deploy_tasks]} - - name: ceph_osd_external_deploy_init when: step|int == 1 - tags: ceph + tags: + - ceph + - ceph_fstobs + - ceph_systemd block: - name: set ceph-ansible group vars osds set_fact: diff --git a/deployment/ceph-ansible/ceph-rbdmirror.yaml b/deployment/ceph-ansible/ceph-rbdmirror.yaml index b1cb3653b7..abc8f4dfda 100644 --- a/deployment/ceph-ansible/ceph-rbdmirror.yaml +++ b/deployment/ceph-ansible/ceph-rbdmirror.yaml @@ -93,7 +93,10 @@ outputs: - {get_attr: [CephBase, role_data, external_deploy_tasks]} - - name: ceph_rbdmirror_external_deploy_init when: step|int == 1 - tags: ceph + tags: + - ceph + - ceph_fstobs + - ceph_systemd block: - name: set ceph-ansible group vars rbdmirrors set_fact: diff --git a/deployment/ceph-ansible/ceph-rgw.yaml b/deployment/ceph-ansible/ceph-rgw.yaml index 8e867549c6..dee67a0649 100644 --- a/deployment/ceph-ansible/ceph-rgw.yaml +++ b/deployment/ceph-ansible/ceph-rgw.yaml @@ -131,7 +131,10 @@ outputs: - {get_attr: [CephBase, role_data, external_deploy_tasks]} - - name: ceph_rgw_external_deploy_init when: step|int == 1 - tags: ceph + tags: + - ceph + - ceph_fstobs + - ceph_systemd block: - name: set ceph-ansible group vars rgws set_fact: