From f3e9a5adace8e893e84271433e71a4475f94fb2c Mon Sep 17 00:00:00 2001 From: travisn Date: Mon, 26 Aug 2019 11:20:38 -0600 Subject: [PATCH] ceph: starting the device discovery only based on env var The decision to start the device discovery daemonset is made by an env var on the operator pod since in some scenarios the discovery needs to be started immediately with the operator instead of being delayed to start with the cluster. Signed-off-by: travisn --- pkg/operator/ceph/operator.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkg/operator/ceph/operator.go b/pkg/operator/ceph/operator.go index df3e44997..6db5cf681 100644 --- a/pkg/operator/ceph/operator.go +++ b/pkg/operator/ceph/operator.go @@ -166,15 +166,6 @@ func (o *Operator) startSystemDaemons(externalCeph bool) error { } } - // The discover daemon is only needed for local clusters where OSDs will be created. - // External clusters do not create OSDs locally. - if !externalCeph { - rookDiscover := discover.New(o.context.Clientset) - if err := rookDiscover.Start(namespace, o.rookImage, o.securityAccount); err != nil { - return fmt.Errorf("Error starting device discovery daemonset: %v", err) - } - } - serverVersion, err := o.context.Clientset.Discovery().ServerVersion() if err != nil { return fmt.Errorf("error getting server version: %v", err)