From 4ccaea654aa95db20bf0b63c890840640ad8be4e Mon Sep 17 00:00:00 2001 From: Alexander Trost Date: Fri, 24 Aug 2018 13:20:44 +0200 Subject: [PATCH] Updated DefaultClusterName to match rook-ceph Signed-off-by: Alexander Trost --- pkg/operator/ceph/cluster/controller.go | 2 +- pkg/operator/ceph/provisioner/provisioner_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/operator/ceph/cluster/controller.go b/pkg/operator/ceph/cluster/controller.go index 06b724b3b..e6e851f8a 100644 --- a/pkg/operator/ceph/cluster/controller.go +++ b/pkg/operator/ceph/cluster/controller.go @@ -57,7 +57,7 @@ const ( const ( // DefaultClusterName states the default name of the rook-cluster if not provided. - DefaultClusterName = "rook" + DefaultClusterName = "rook-ceph" clusterDeleteRetryInterval = 2 //seconds clusterDeleteMaxRetries = 15 ) diff --git a/pkg/operator/ceph/provisioner/provisioner_test.go b/pkg/operator/ceph/provisioner/provisioner_test.go index 5b757cf80..b879a2bac 100644 --- a/pkg/operator/ceph/provisioner/provisioner_test.go +++ b/pkg/operator/ceph/provisioner/provisioner_test.go @@ -120,7 +120,7 @@ func TestParseClassParametersDefault(t *testing.T) { assert.Nil(t, err) assert.Equal(t, "testPool", provConfig.pool) - assert.Equal(t, "rook", provConfig.clusterNamespace) + assert.Equal(t, "rook-ceph", provConfig.clusterNamespace) assert.Equal(t, "", provConfig.fstype) }