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>

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"

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:

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

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

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:

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

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"

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',