From c9cd67124fb758e9023395e5ae4f8223111e2e51 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 --- 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 436849ab17..ac14b74b12 100644 --- a/deployment/ceph-ansible/ceph-grafana.yaml +++ b/deployment/ceph-ansible/ceph-grafana.yaml @@ -123,7 +123,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 bf8eeec0b7..b8a53539c4 100644 --- a/deployment/ceph-ansible/ceph-mds.yaml +++ b/deployment/ceph-ansible/ceph-mds.yaml @@ -81,7 +81,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 b1f42bfa6c..9e615ff659 100644 --- a/deployment/ceph-ansible/ceph-mgr.yaml +++ b/deployment/ceph-ansible/ceph-mgr.yaml @@ -111,7 +111,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 813aa09f6c..2801719e1f 100644 --- a/deployment/ceph-ansible/ceph-mon.yaml +++ b/deployment/ceph-ansible/ceph-mon.yaml @@ -95,7 +95,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 c9520c8465..6178046e5b 100644 --- a/deployment/ceph-ansible/ceph-nfs.yaml +++ b/deployment/ceph-ansible/ceph-nfs.yaml @@ -84,7 +84,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 25e4cb896a..5dab5dcf6a 100644 --- a/deployment/ceph-ansible/ceph-osd.yaml +++ b/deployment/ceph-ansible/ceph-osd.yaml @@ -98,7 +98,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 efeb4ebb4c..3c8ab52442 100644 --- a/deployment/ceph-ansible/ceph-rbdmirror.yaml +++ b/deployment/ceph-ansible/ceph-rbdmirror.yaml @@ -97,7 +97,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 685188abbf..901da651ac 100644 --- a/deployment/ceph-ansible/ceph-rgw.yaml +++ b/deployment/ceph-ansible/ceph-rgw.yaml @@ -140,7 +140,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: