qa/tasks/ceph: explicitly add osds to crush map for upgrades

Before kraken, ceph-osd didn't add itself to crush... ceph-osd-prestart.sh
did it.  And ceph.py doesn't use that.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/1-jewel-install/jewel.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/1-jewel-install/jewel.yaml
index a617f91d19aba95fa2c73e751162c1a61452781f..c138b9be446c99c6d25ce06a000ca3d6bd04d85d 100644 (file)
--- a/qa/suites/rados/upgrade/jewel-x-singleton/1-jewel-install/jewel.yaml
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/1-jewel-install/jewel.yaml
@@ -7,4 +7,5 @@ tasks:
 - print: "**** done install jewel"
 - ceph:
     skip_mgr_daemons: true
+    add_osds_to_crush: true
 - print: "**** done ceph"

diff --git a/qa/suites/upgrade/hammer-jewel-x/parallel/1-hammer-jewel-install/hammer-jewel.yaml b/qa/suites/upgrade/hammer-jewel-x/parallel/1-hammer-jewel-install/hammer-jewel.yaml
index d743c89a50300b726a0497dc10ca865cb41002e0..c57e071ca69b1bc3370c29e00642c0f127a341d6 100644 (file)
--- a/qa/suites/upgrade/hammer-jewel-x/parallel/1-hammer-jewel-install/hammer-jewel.yaml
+++ b/qa/suites/upgrade/hammer-jewel-x/parallel/1-hammer-jewel-install/hammer-jewel.yaml
@@ -6,6 +6,7 @@ tasks:
 - ceph:
    fs: xfs
    skip_mgr_daemons: true
+   add_osds_to_crush: true
 - install.upgrade:
     exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
     osd.0:

diff --git a/qa/suites/upgrade/hammer-jewel-x/stress-split/1-hammer-install-and-upgrade-to-jewel/hammer-to-jewel.yaml b/qa/suites/upgrade/hammer-jewel-x/stress-split/1-hammer-install-and-upgrade-to-jewel/hammer-to-jewel.yaml
index b69da11c5e9fa356464a66567374b3b64feff8a5..212b8ff5cc544a2a6be99bcf61d7aa95d27f342c 100644 (file)
--- a/qa/suites/upgrade/hammer-jewel-x/stress-split/1-hammer-install-and-upgrade-to-jewel/hammer-to-jewel.yaml
+++ b/qa/suites/upgrade/hammer-jewel-x/stress-split/1-hammer-install-and-upgrade-to-jewel/hammer-to-jewel.yaml
@@ -10,6 +10,7 @@ tasks:
 - ceph:
     fs: xfs
     skip_mgr_daemons: true
+    add_osds_to_crush: true
 - install.upgrade:
     exclude_packages:
     - ceph-mgr

diff --git a/qa/suites/upgrade/hammer-jewel-x/tiering/1-install-hammer-and-upgrade-to-jewel/hammer-to-jewel.yaml b/qa/suites/upgrade/hammer-jewel-x/tiering/1-install-hammer-and-upgrade-to-jewel/hammer-to-jewel.yaml
index 4c58e5f0d7511388522162659a9aa0cd4d5eadf6..7485dcef5b855f0951b0088fe2949a4ad3f3c82b 100644 (file)
--- a/qa/suites/upgrade/hammer-jewel-x/tiering/1-install-hammer-and-upgrade-to-jewel/hammer-to-jewel.yaml
+++ b/qa/suites/upgrade/hammer-jewel-x/tiering/1-install-hammer-and-upgrade-to-jewel/hammer-to-jewel.yaml
@@ -10,3 +10,4 @@ tasks:
 - ceph:
     fs: xfs
     skip_mgr_daemons: true
+    add_osds_to_crush: true

diff --git a/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml b/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml
index f5eec07e51d0a536f796a0a327881171dee9fd1a..61b6f81f352bb7aec469d408422334957c28dd5e 100644 (file)
--- a/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml
+++ b/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml
@@ -10,6 +10,7 @@ tasks:
 - print: "**** done installing jewel"
 - ceph:
     skip_mgr_daemons: true
+    add_osds_to_crush: true
 - print: "**** done ceph"
 - install.upgrade:
     mon.a:

diff --git a/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml b/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
index fd4a1d8f6b7b431a8795d7e491ad9ff35f1dcd3f..67d57f7b3f36158ff403dd402247190e906150ed 100644 (file)
--- a/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
+++ b/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
@@ -49,6 +49,7 @@ tasks:
 - ceph:
    fs: xfs
    skip_mgr_daemons: true
+   add_osds_to_crush: true
 - print: "**** done ceph xfs"
 - sequential:
    - workload

diff --git a/qa/suites/upgrade/jewel-x/stress-split/1-jewel-install/jewel.yaml b/qa/suites/upgrade/jewel-x/stress-split/1-jewel-install/jewel.yaml
index a617f91d19aba95fa2c73e751162c1a61452781f..c138b9be446c99c6d25ce06a000ca3d6bd04d85d 100644 (file)
--- a/qa/suites/upgrade/jewel-x/stress-split/1-jewel-install/jewel.yaml
+++ b/qa/suites/upgrade/jewel-x/stress-split/1-jewel-install/jewel.yaml
@@ -7,4 +7,5 @@ tasks:
 - print: "**** done install jewel"
 - ceph:
     skip_mgr_daemons: true
+    add_osds_to_crush: true
 - print: "**** done ceph"

diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index 1a950f0870f8c5e6e5bb382543806ff75e5bc358..88af108017ad083e40c5e4a404636369df3c9a74 100644 (file)
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@ -1130,6 +1130,20 @@ def run_daemon(ctx, config, type_):
                             id_,
                         ]
                     )
+                if config.get('add_osds_to_crush'):
+                    remote.run(
+                        args=[
+                            'sudo',
+                            'ceph',
+                            'osd',
+                            'crush',
+                            'create-or-move',
+                            'osd.' + id_,
+                            '1.0',
+                            'host=localhost',
+                            'root=default',
+                        ]
+                    )
 
             run_cmd = [
                 'sudo',