From: Sage Weil <sage@redhat.com>
Date: Tue, 16 Apr 2019 19:31:29 +0000 (-0500)
Subject: Merge PR #27556 into master
X-Git-Tag: v15.1.0~2918
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=98923d8a2160d50d84fb81d166649367523a49d4;p=ceph.git

Merge PR #27556 into master

* refs/pull/27556/head:
	mgr/rook: Remove support for Rook older than v0.9

Reviewed-by: Travis Nielsen <tnielsen@redhat.com>
Reviewed-by: Blaine Gardner <bgardner@suse.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
---

98923d8a2160d50d84fb81d166649367523a49d4
diff --cc .githubmap
index f9d2ace5df54,79a3dbb80394..1a3f1010cc27
--- a/.githubmap
+++ b/.githubmap
@@@ -97,4 -97,3 +97,6 @@@ mikechristie Mike Christie <mchristi@re
  andrewschoen Andrew Schoen <aschoen@redhat.com>
  mattbenjamin Matt Benjamin <mbenjami@redhat.com>
  baruza Barbora Ančincová <bara@redhat.com>
 +GabrielBrascher Gabriel Brascher <gabriel@apache.org>
++BlaineEXE Blaine Gardner <bgardner@suse.com>
++travisn Travis Nielsen <tnielsen@redhat.com>
diff --cc src/pybind/mgr/rook/rook_cluster.py
index 1ada1e6e6a47,4b4f782ab077..ef4040754e3d
--- a/src/pybind/mgr/rook/rook_cluster.py
+++ b/src/pybind/mgr/rook/rook_cluster.py
@@@ -257,10 -257,10 +257,10 @@@ class RookCluster(object)
              "kind": "CephObjectStore",
              "metadata": {
                  "name": spec.name,
-                 "namespace": self.rook_env.cluster_ns
+                 "namespace": self.rook_env.namespace
              },
              "spec": {
 -                "metaDataPool": {
 +                "metadataPool": {
                      "failureDomain": "host",
                      "replicated": {
                          "size": 1