Merge "Add filestore to bluestore migration tags"

2020-07-06 19:39:52 +00:00 · 2020-07-06 19:39:52 +00:00 · 8c0a98c1a0
parent e6e2376396 c9cd67124f
commit 8c0a98c1a0
10 changed files with 40 additions and 10 deletions
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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: