]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #27556 into master
authorSage Weil <sage@redhat.com>
Tue, 16 Apr 2019 19:31:29 +0000 (14:31 -0500)
committerSage Weil <sage@redhat.com>
Tue, 16 Apr 2019 19:31:30 +0000 (14:31 -0500)
* 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>
1  2 
.githubmap
src/pybind/mgr/rook/module.py
src/pybind/mgr/rook/rook_cluster.py

diff --cc .githubmap
index f9d2ace5df54f53600eb4561955c81f7f7b43a59,79a3dbb8039481f48abc03589b1765e7ec5a3c02..1a3f1010cc2732b928dd149ba325ef34885114e5
@@@ -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>
Simple merge
index 1ada1e6e6a470a440eeb1b1e77e6511f2ab0e2fb,4b4f782ab077456fe8928940d780b2228db56550..ef4040754e3de85a0f04fcfd71310cdfeba2f7e9
@@@ -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